diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-13 12:54:39 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-13 12:55:06 +0200 |
| commit | 3d9362d5ac1ec405955503dc67caf59e716df5e4 (patch) | |
| tree | f51747f35eb0eec7d38269474869440d8f8758e2 /src/rpcserver.cpp | |
| parent | 44fa82d47e5c8e1c511dfdff212f1196425a54f8 (diff) | |
| parent | 85ee55b5c37bedca98ec472439e1710277e8e4b2 (diff) | |
| download | bitcoin-3d9362d5ac1ec405955503dc67caf59e716df5e4.tar.xz | |
Merge pull request #6398
85ee55b rpc: Remove chain-specific RequireRPCPassword (Wladimir J. van der Laan)
Diffstat (limited to 'src/rpcserver.cpp')
| -rw-r--r-- | src/rpcserver.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index aeb51fed56..8f5ff10a80 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -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); |