GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge e09ad284c7 into merged_master (Bitcoin PR bitcoin/bitcoin#24675)

Browse source
This commit is contained in:
Byron Hambly 2024-10-25 11:37:05 +02:00
commit a1f37eeae6
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/rpc/request.cpp
View file

@ -66,16 +66,16 @@ UniValue JSONRPCError(int code, const std::string& message)
*/
static const std::string COOKIEAUTH_USER = "__cookie__";
/** Default name for auth cookie file */
static const std::string COOKIEAUTH_FILE = ".cookie";
static const char* const COOKIEAUTH_FILE = ".cookie";
/** Get name of RPC authentication cookie file */
static fs::path GetAuthCookieFile(bool temp=false)
{
std::string arg = gArgs.GetArg("-rpccookiefile", COOKIEAUTH_FILE);
fs::path arg = gArgs.GetPathArg("-rpccookiefile", COOKIEAUTH_FILE);
if (temp) {
arg += ".tmp";
}
return AbsPathForConfigVal(fs::PathFromString(arg));
return AbsPathForConfigVal(arg);
}
bool GenerateAuthCookie(std::string *cookie_out)