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

only allow duplicates for certain options of the config

This commit is contained in:
Alfredo Garcia 2020-06-24 12:21:25 -03:00
parent 552482a404
commit 26522d212b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util.cpp
View File

@ -627,10 +627,21 @@ void ReadConfigFile(const std::string& confPath,
set<string> setOptions;
setOptions.insert("*");
const vector<string> allowed_duplicates = {"addnode", "connect", "rpcallowip"};
set<string> unique_options;
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
{
string strKey = string("-") + it->string_key;
string strValue = it->value[0];
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));
}
}
InterpretNegativeSetting(strKey, strValue);
// Don't overwrite existing settings so command line settings override zcash.conf
if (mapSettingsRet.count(strKey) == 0)