diff options
| author | 2016-12-08 01:57:47 +0000 | |
|---|---|---|
| committer | 2016-12-08 02:01:40 +0000 | |
| commit | 3fd1ba753d0e4cb56ecb22ddfdabd6795e17ff25 (patch) | |
| tree | b6737fd91223d5291477fc960f0bf880f9d0b40c /src/configreader.cpp | |
| parent | Merge pull request #1260 from SaberUK/master+libressl (diff) | |
Store config values in a map instead of a unique vector of pairs.
Diffstat (limited to 'src/configreader.cpp')
| -rw-r--r-- | src/configreader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index 9d327532b..8263b8737 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -46,7 +46,7 @@ ServerLimits::ServerLimits(ConfigTag* tag) static ConfigTag* CreateEmptyTag() { - std::vector<KeyVal>* items; + ConfigItems* items; return ConfigTag::create("empty", "<auto>", 0, items); } @@ -220,9 +220,9 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) if (blk_count == 0) { // No connect blocks found; make a trivial default block - std::vector<KeyVal>* items; + ConfigItems* items; ConfigTag* tag = ConfigTag::create("connect", "<auto>", 0, items); - items->push_back(std::make_pair("allow", "*")); + (*items)["allow"] = "*"; config_data.insert(std::make_pair("connect", tag)); blk_count = 1; } |
