diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-06-01 20:21:45 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-06-01 20:21:45 +0200 |
| commit | 14d329564960a858d2e459cb3f067f0cf360f500 (patch) | |
| tree | f80da399fb3d687864cf8a053dbcc459703a1c66 /src/daemon/rpc_command_executor.cpp | |
| parent | 42e2ed31ae726bc40ff6498bd386be43fc5d9e4f (diff) | |
| parent | 9bfa4c20ca9df1df3966cb1f4c14f14b6e8c2202 (diff) | |
| download | monzero-core-14d329564960a858d2e459cb3f067f0cf360f500.tar.gz monzero-core-14d329564960a858d2e459cb3f067f0cf360f500.tar.xz monzero-core-14d329564960a858d2e459cb3f067f0cf360f500.zip | |
Merge pull request #5561
9bfa4c20 Fix allow any cert mode in wallet rpc when configured over rpc (Lee Clagett)
3544596f Add ssl_options support to monerod's rpc mode. (Lee Clagett)
c9aaccf3 Fix configuration bug; wallet2 --daemon-ssl-allow-any-cert now works. (Lee Clagett)
Diffstat (limited to 'src/daemon/rpc_command_executor.cpp')
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 151baa33f..cca0f75f9 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -127,6 +127,7 @@ t_rpc_command_executor::t_rpc_command_executor( uint32_t ip , uint16_t port , const boost::optional<tools::login>& login + , const epee::net_utils::ssl_options_t& ssl_options , bool is_rpc , cryptonote::core_rpc_server* rpc_server ) @@ -137,7 +138,7 @@ t_rpc_command_executor::t_rpc_command_executor( boost::optional<epee::net_utils::http::login> http_login{}; if (login) http_login.emplace(login->username, login->password.password()); - m_rpc_client = new tools::t_rpc_client(ip, port, std::move(http_login)); + m_rpc_client = new tools::t_rpc_client(ip, port, std::move(http_login), ssl_options); } else { |