This was never supposed to be invoked on /rehash, only startup.. so move it to startu...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index ca03056c5c35645dbd6fcfeff15e2244dd003cba..3be7d59452ebafb1f2f5b1295d7dd28d93e98f19 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -816,6 +816,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                {"security",    "hidewhois",    "",                     new ValueContainerChar (this->HideWhoisServer),         DT_NOSPACES, NoValidation},
                {"security",    "hidekills",    "",                     new ValueContainerChar (this->HideKillsServer),         DT_NOSPACES,  NoValidation},
                {"security",    "operspywhois", "0",                    new ValueContainerBool (&this->OperSpyWhois),           DT_BOOLEAN,  NoValidation},
+               {"security",    "restrictbannedusers",  "1",                    new ValueContainerBool (&this->RestrictBannedUsers),            DT_BOOLEAN,  NoValidation},
                {"performance", "nouserdns",    "0",                    new ValueContainerBool (&this->NoUserDns),              DT_BOOLEAN,  NoValidation},
                {"options",     "syntaxhints",  "0",                    new ValueContainerBool (&this->SyntaxHints),            DT_BOOLEAN,  NoValidation},
                {"options",     "cyclehosts",   "0",                    new ValueContainerBool (&this->CycleHosts),             DT_BOOLEAN,  NoValidation},
@@ -1329,17 +1330,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 
        }
 
-       if (bail)
-       {
-               /** Note: This is safe, the method checks for user == NULL */
-               ServerInstance->Threads->Lock();
-               User* user = NULL;
-               if (!useruid.empty())
-                       user = ServerInstance->FindNick(useruid);
-               ServerInstance->Parser->SetupCommandTable(user);
-               ServerInstance->Threads->Unlock();
-       }
-       else
+       if (!bail)
        {
                if (!useruid.empty())
                {