diff options
| author | Adam <adam@sigterm.info> | 2013-04-26 22:13:03 -0700 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2013-04-26 22:13:03 -0700 |
| commit | 370e899d8a53ecfd3ec3a49a5fbb81212fa154e3 (patch) | |
| tree | 06b001530ef64b7a78d271197cf838a2760edfef /src/configreader.cpp | |
| parent | 79e462c530a4617d688ca3c648ece2d8ebb7396a (diff) | |
| parent | f2566ff550bc3516eb35fab76217384866de8bcb (diff) | |
Merge pull request #501 from SaberUK/master+nouserdns
Move <performance:nouserdns> to <connect:nouserdns>.
Diffstat (limited to 'src/configreader.cpp')
| -rw-r--r-- | src/configreader.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index 32e8966fa..1b565c7f7 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -313,6 +313,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) me->maxchans = tag->getInt("maxchans", me->maxchans); me->maxconnwarn = tag->getBool("maxconnwarn", me->maxconnwarn); me->limit = tag->getInt("limit", me->limit); + me->nouserdns = tag->getBool("nouserdns", me->nouserdns); ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask); if (oldMask != oldBlocksByMask.end()) @@ -346,12 +347,13 @@ struct DeprecatedConfig }; static const DeprecatedConfig ChangedConfig[] = { - { "bind", "transport", "", "has been moved to <bind:ssl> as of 2.0" }, - { "die", "value", "", "you need to reread your config" }, - { "link", "autoconnect", "", "2.0+ does not use this attribute - define <autoconnect> tags instead" }, - { "link", "transport", "", "has been moved to <link:ssl> as of 2.0" }, - { "module", "name", "m_chanprotect.so", "has been replaced with m_customprefix as of 2.2" }, - { "module", "name", "m_halfop.so", "has been replaced with m_customprefix as of 2.2" }, + { "bind", "transport", "", "has been moved to <bind:ssl> as of 2.0" }, + { "die", "value", "", "you need to reread your config" }, + { "link", "autoconnect", "", "2.0+ does not use this attribute - define <autoconnect> tags instead" }, + { "link", "transport", "", "has been moved to <link:ssl> as of 2.0" }, + { "module", "name", "m_chanprotect.so", "has been replaced with m_customprefix as of 2.2" }, + { "module", "name", "m_halfop.so", "has been replaced with m_customprefix as of 2.2" }, + { "performance", "nouserdns", "", "has been moved to <connect:nouserdns> as of 2.2" } }; void ServerConfig::Fill() |