Remove more deprecated code

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 56aab671fe54c29f13364e8e695954e00fa98596..1f863ba62badb93092817f137af8abecfb1df198 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -389,7 +389,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
                                throw CoreException("Two connect classes with name \"" + name + "\" defined!");
                        names[name] = i;
 
-                       ConnectClass* me = parent ? 
+                       ConnectClass* me = parent ?
                                new ConnectClass(tag, type, mask, *parent) :
                                new ConnectClass(tag, type, mask);
 
@@ -471,7 +471,7 @@ static const Deprecated ChangedConfig[] = {
        {"die",     "value",            "you need to reread your config"},
        {"bind",    "transport",                "has been moved to <bind:ssl> as of 2.0a1"},
        {"link",    "transport",                "has been moved to <link:ssl> as of 2.0a1"},
-       
+       {"link",        "autoconnect",          "2.0+ does not use the autoconnect value. Please define <autoconnect> tags instead."},
 };
 
 void ServerConfig::Fill()
@@ -551,7 +551,6 @@ void ServerConfig::Fill()
        Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
        InvBypassModes = options->getBool("invitebypassmodes", true);
        NoSnoticeStack = options->getBool("nosnoticestack", false);
-       WelcomeNotice = options->getBool("welcomenotice", true);
 
        range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
        range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
@@ -648,8 +647,6 @@ void ServerConfig::Fill()
                OperSpyWhois = SPYWHOIS_SINGLEMSG;
        else
                OperSpyWhois = SPYWHOIS_NONE;
-
-       Limits.Finalise();
 }
 
 // WARNING: it is not safe to use most of the codebase in this function, as it