diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 13:50:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 13:53:57 +0100 |
| commit | cb83af9937138ac7daa692202e4578f117a0fefb (patch) | |
| tree | 644bd7b36ae8e78859349334accb65ee28a0d878 /src | |
| parent | 37c47e18098f678a543d3a0a62e31092c757cb9d (diff) | |
| parent | 77c38bb5cc7349b5b0159f04e769f863e76aad7b (diff) | |
| download | bitcoin-cb83af9937138ac7daa692202e4578f117a0fefb.tar.xz | |
Merge pull request #5318
77c38bb Truthier error message when rpcpassword is missing (Glenn Willen)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpcserver.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 01005c1cee..7022c50375 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -565,13 +565,8 @@ void StartRPCThreads() { unsigned char rand_pwd[32]; GetRandBytes(rand_pwd, 32); - string strWhatAmI = "To use bitcoind"; - if (mapArgs.count("-server")) - strWhatAmI = strprintf(_("To use the %s option"), "\"-server\""); - else if (mapArgs.count("-daemon")) - strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\""); uiInterface.ThreadSafeMessageBox(strprintf( - _("%s, you must set a rpcpassword in the configuration file:\n" + _("To use bitcoind, or the -server option to bitcoin-qt, you must set an rpcpassword in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" "rpcuser=bitcoinrpc\n" @@ -581,7 +576,6 @@ void StartRPCThreads() "If the file does not exist, create it with owner-readable-only file permissions.\n" "It is also recommended to set alertnotify so you are notified of problems;\n" "for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), - strWhatAmI, GetConfigFile().string(), EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32)), "", CClientUIInterface::MSG_ERROR | CClientUIInterface::SECURE); |