diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-02-19 22:25:44 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-02-19 22:25:44 -0500 |
| commit | 39e18902763a5fd6f355294d8b135c8f5bc2ec99 (patch) | |
| tree | 01f44207f9e6cda6d9f3433fe43a9c65d4916bc5 /src/rpc | |
| parent | Merge pull request #6197 (diff) | |
| parent | daemon: run with -rpc-payment-address and --rpc-restricted-bind-port (diff) | |
| download | monero-39e18902763a5fd6f355294d8b135c8f5bc2ec99.tar.xz | |
Merge pull request #6198
5f2a32c daemon: run with -rpc-payment-address and --rpc-restricted-bind-port (moneromooo-monero)
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 3 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index e92ae7c08..409c8a01c 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -236,6 +236,7 @@ namespace cryptonote const boost::program_options::variables_map& vm , const bool restricted , const std::string& port + , bool allow_rpc_payment ) { m_restricted = restricted; @@ -247,7 +248,7 @@ namespace cryptonote return false; std::string address = command_line::get_arg(vm, arg_rpc_payment_address); - if (!address.empty()) + if (!address.empty() && allow_rpc_payment) { if (!m_restricted && nettype() != FAKECHAIN) { diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h index 23c611470..fbcffd120 100644 --- a/src/rpc/core_rpc_server.h +++ b/src/rpc/core_rpc_server.h @@ -88,7 +88,8 @@ namespace cryptonote bool init( const boost::program_options::variables_map& vm, const bool restricted, - const std::string& port + const std::string& port, + bool allow_rpc_payment ); network_type nettype() const { return m_core.get_nettype(); } |