Merge pull request #6398

85ee55b rpc: Remove chain-specific RequireRPCPassword (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan
2015-07-13 12:54:39 +02:00
3 changed files with 1 additions and 7 deletions

View File

@@ -598,8 +598,7 @@ void StartRPCThreads()
LogPrint("rpc", "Allowing RPC connections from: %s\n", strAllowed);
strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
if (((mapArgs["-rpcpassword"] == "") ||
(mapArgs["-rpcuser"] == mapArgs["-rpcpassword"])) && Params().RequireRPCPassword())
if (mapArgs["-rpcpassword"] == "")
{
unsigned char rand_pwd[32];
GetRandBytes(rand_pwd, 32);