Merge insp20

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 32e8966fadfbdcaf02e77adefdc7df3c397a95dc..dcf4b7162c237dc6df175f507c076f36bc0a6eb9 100644 (file)
--- 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()
@@ -429,7 +431,8 @@ void ServerConfig::Fill()
        NoSnoticeStack = options->getBool("nosnoticestack", false);
 
        range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
-       range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
+       if (ConfValue("performance")->getBool("limitsomaxconn", true))
+               range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
        range(MaxTargets, 1, 31, 20, "<security:maxtargets>");
        range(NetBufferSize, 1024, 65534, 10240, "<performance:netbuffersize>");