Merge insp20

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index d52f3de13fdc3f03690947555f0f4a6d92b6337e..68495623c778b1a03ad9a02fad1f3e7ac3f87e01 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -53,6 +53,7 @@ static ConfigTag* CreateEmptyTag()
 ServerConfig::ServerConfig()
        : EmptyTag(CreateEmptyTag())
        , Limits(EmptyTag)
+       , NoSnoticeStack(false)
 {
        RawLog = HideBans = HideSplits = UndernetMsgPrefix = false;
        WildcardIPv6 = InvBypassModes = true;
@@ -575,7 +576,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
                 errstr << "Possible configuration error: you have not defined any <bind> blocks." << std::endl
                         << "You will need to do this if you want clients to be able to connect!" << std::endl;
 
-       if (old)
+       if (old && valid)
        {
                // On first run, ports are bound later on
                FailedPortList pl;
@@ -784,6 +785,7 @@ void ConfigReaderThread::Finish()
                 * XXX: The order of these is IMPORTANT, do not reorder them without testing
                 * thoroughly!!!
                 */
+               ServerInstance->Users.RehashCloneCounts();
                ServerInstance->XLines->CheckELines();
                ServerInstance->XLines->ApplyLines();
                ChanModeReference ban(NULL, "ban");