diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-09 15:07:32 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-09 15:08:26 +0100 |
commit | ff7f7364d6a244c78adc5575a0ad03a743b5dad9 (patch) | |
tree | 120ec0b26091695741ead9103f11f1a2f1333192 /src | |
parent | 3f125151998d9fead198fd44243dd64006b5a56b (diff) | |
parent | 8cff83124bcac936ecc6add6dca72b125a79a08f (diff) |
Merge #15087: Error if rpcpassword contains hash in conf sections
8cff83124bcac936ecc6add6dca72b125a79a08f Error if rpcpassword contains hash in conf sections (MeshCollider)
Pull request description:
Fixes #15075
Tree-SHA512: 08ba2a2e9a7ea228fc0e0ff9aa76da1fecbe079e3b388304a28b6399e338a4b3a38b03ab03aca880e75f14a8d2ba75ceb31a385d7989cd66db5193a79f32c4e5
Diffstat (limited to 'src')
-rw-r--r-- | src/util/system.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 8e201ec590..ffe4d21ee3 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -865,7 +865,7 @@ static bool GetConfigOptions(std::istream& stream, std::string& error, std::vect } else if ((pos = str.find('=')) != std::string::npos) { std::string name = prefix + TrimString(str.substr(0, pos), pattern); std::string value = TrimString(str.substr(pos + 1), pattern); - if (used_hash && name == "rpcpassword") { + if (used_hash && name.find("rpcpassword") != std::string::npos) { error = strprintf("parse error on line %i, using # in rpcpassword can be ambiguous and should be avoided", linenr); return false; } |