diff options
| author | Wladimir J. van der Laan <[email protected]> | 2013-06-02 05:21:24 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2013-06-02 05:21:24 -0700 |
| commit | 50b4086a4a4fbba8241c4b8807870d7b44c109fe (patch) | |
| tree | fe299488d21bae0e041e32319c1ff8c825f0d446 /src/bitcoinrpc.cpp | |
| parent | Merge pull request #2721 from laanwj/2013_05_qt5 (diff) | |
| parent | remove GetBoolArg() fDefault parameter defaulting to false (diff) | |
| download | discoin-50b4086a4a4fbba8241c4b8807870d7b44c109fe.tar.xz discoin-50b4086a4a4fbba8241c4b8807870d7b44c109fe.zip | |
Merge pull request #2588 from Diapolo/GetBoolArg
remove GetBoolArg() fDefault parameter defaulting to false
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index a1d76e181..c99b74f18 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -757,7 +757,7 @@ void StartRPCThreads() rpc_io_service = new asio::io_service(); rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23); - const bool fUseSSL = GetBoolArg("-rpcssl"); + const bool fUseSSL = GetBoolArg("-rpcssl", false); if (fUseSSL) { @@ -1037,7 +1037,7 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s // Observe safe mode string strWarning = GetWarnings("rpc"); - if (strWarning != "" && !GetBoolArg("-disablesafemode") && + if (strWarning != "" && !GetBoolArg("-disablesafemode", false) && !pcmd->okSafeMode) throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE, string("Safe mode: ") + strWarning); @@ -1071,7 +1071,7 @@ Object CallRPC(const string& strMethod, const Array& params) GetConfigFile().string().c_str())); // Connect to localhost - bool fUseSSL = GetBoolArg("-rpcssl"); + bool fUseSSL = GetBoolArg("-rpcssl", false); asio::io_service io_service; ssl::context context(io_service, ssl::context::sslv23); context.set_options(ssl::context::no_sslv2); |