zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add more allowed duplicates 

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Alfredo Garcia 2020-07-29 08:45:02 -03:00 committed by GitHub
parent 26522d212b
commit 6abcf40a3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/util.cpp
View File

@ -627,7 +627,23 @@ void ReadConfigFile(const std::string& confPath,
set<string> setOptions;
setOptions.insert("*");
const vector<string> allowed_duplicates = {"addnode", "connect", "rpcallowip"};
const vector<string> allowed_duplicates = {
"addnode",
"bind",
"connect",
"debug",
"externalip",
"fundingstream",
"loadblock",
"onlynet",
"rpcallowip",
"rpcauth",
"rpcbind",
"seednode",
"uacomment",
"whitebind",
"whitelist"
};
set<string> unique_options;
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
@ -638,7 +654,7 @@ void ReadConfigFile(const std::string& confPath,
if (find(allowed_duplicates.begin(), allowed_duplicates.end(), it->string_key) == allowed_duplicates.end())
{
if (!unique_options.insert(strKey).second) {
throw std::runtime_error(strprintf("Not allowed duplicated option %s found.", strKey));
throw std::runtime_error(strprintf("Option '%s' is duplicated, which is not allowed.", strKey));
}
}