aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/main.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-06-01 20:21:45 +0200
committerRiccardo Spagni <ric@spagni.net>2019-06-01 20:21:45 +0200
commit14d329564960a858d2e459cb3f067f0cf360f500 (patch)
treef80da399fb3d687864cf8a053dbcc459703a1c66 /src/daemon/main.cpp
parentMerge pull request #5558 (diff)
parentFix allow any cert mode in wallet rpc when configured over rpc (diff)
downloadmonero-14d329564960a858d2e459cb3f067f0cf360f500.tar.xz
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/main.cpp')
-rw-r--r--src/daemon/main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index dbbb2308c..690d4d60e 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -324,7 +324,11 @@ int main(int argc, char const * argv[])
}
}
- daemonize::t_command_server rpc_commands{rpc_ip, rpc_port, std::move(login)};
+ auto ssl_options = cryptonote::rpc_args::process_ssl(vm, true);
+ if (!ssl_options)
+ return 1;
+
+ daemonize::t_command_server rpc_commands{rpc_ip, rpc_port, std::move(login), std::move(*ssl_options)};
if (rpc_commands.process_command_vec(command))
{
return 0;