nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4337

Browse Source 
97764bae wallet_rpc_server: error out if wallet-file and wallet-dir are both used (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-14 13:06:22 +02:00
commit 7850541074
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet_rpc_server.cpp
View File

@ -160,8 +160,13 @@ namespace tools
std::string bind_port = command_line::get_arg(*m_vm, arg_rpc_bind_port); std::string bind_port = command_line::get_arg(*m_vm, arg_rpc_bind_port);
const bool disable_auth = command_line::get_arg(*m_vm, arg_disable_rpc_login); const bool disable_auth = command_line::get_arg(*m_vm, arg_disable_rpc_login);
m_restricted = command_line::get_arg(*m_vm, arg_restricted); m_restricted = command_line::get_arg(*m_vm, arg_restricted);
if (command_line::has_arg(*m_vm, arg_wallet_dir)) if (!command_line::is_arg_defaulted(*m_vm, arg_wallet_dir))
{ {
if (!command_line::is_arg_defaulted(*m_vm, wallet_args::arg_wallet_file()))
{
MERROR(arg_wallet_dir.name << " and " << wallet_args::arg_wallet_file().name << " are incompatible, use only one of them");
return false;
}
m_wallet_dir = command_line::get_arg(*m_vm, arg_wallet_dir); m_wallet_dir = command_line::get_arg(*m_vm, arg_wallet_dir);
#ifdef _WIN32 #ifdef _WIN32
#define MKDIR(path, mode) mkdir(path) #define MKDIR(path, mode) mkdir(path)