Merge pull request #8187

9bde2db Fixes: Don't require --rpc-login with --rpc-access-control-origins #8168 (Jeffrey)
This commit is contained in:
luigi1111 2022-03-18 16:32:25 -05:00
commit 427bd85893
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -247,12 +247,6 @@ namespace cryptonote
auto access_control_origins_input = command_line::get_arg(vm, arg.rpc_access_control_origins); auto access_control_origins_input = command_line::get_arg(vm, arg.rpc_access_control_origins);
if (!access_control_origins_input.empty()) if (!access_control_origins_input.empty())
{ {
if (!config.login)
{
LOG_ERROR(arg.rpc_access_control_origins.name << tr(" requires RPC server password --") << arg.rpc_login.name << tr(" cannot be empty"));
return boost::none;
}
std::vector<std::string> access_control_origins; std::vector<std::string> access_control_origins;
boost::split(access_control_origins, access_control_origins_input, boost::is_any_of(",")); boost::split(access_control_origins, access_control_origins_input, boost::is_any_of(","));
std::for_each(access_control_origins.begin(), access_control_origins.end(), std::bind(&boost::trim<std::string>, std::placeholders::_1, std::locale::classic())); std::for_each(access_control_origins.begin(), access_control_origins.end(), std::bind(&boost::trim<std::string>, std::placeholders::_1, std::locale::classic()));