m_shun Fix out of bounds vector access leading to crashes when hiding part reason...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index c0e9b5992dabf50b1f0d32859b9520ff132f0651..b0bb6a92feb8455ee8b4c76edf2cc7f77415721c 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include <fstream>
 #include "xline.h"
@@ -234,7 +245,7 @@ void ServerConfig::CrossCheckOperClassType()
                if (tblk == oper_blocks.end())
                        throw CoreException("Oper block " + name + " has missing type " + type);
                if (oper_blocks.find(name) != oper_blocks.end())
-                       throw CoreException("Duplicate oper block with name " + name);
+                       throw CoreException("Duplicate oper block with name " + name + " at " + tag->getTagLocation());
 
                OperInfo* ifo = new OperInfo;
                ifo->name = type;
@@ -375,6 +386,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
                        me->maxlocal = tag->getInt("localmax", me->maxlocal);
                        me->maxglobal = tag->getInt("globalmax", me->maxglobal);
                        me->maxchans = tag->getInt("maxchans", me->maxchans);
+                       me->maxconnwarn = tag->getBool("maxconnwarn", me->maxconnwarn);
                        me->limit = tag->getInt("limit", me->limit);
 
                        ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask);
@@ -504,6 +516,7 @@ void ServerConfig::Fill()
        Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128);
        Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
        InvBypassModes = options->getBool("invitebypassmodes", true);
+       NoSnoticeStack = options->getBool("nosnoticestack", false);
 
        range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
        range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
@@ -531,7 +544,7 @@ void ServerConfig::Fill()
                if (socktest < 0)
                        WildcardIPv6 = false;
                else
-                       close(socktest);
+                       ServerInstance->SE->Close(socktest);
        }
        ConfigTagList tags = ConfTags("uline");
        for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -591,7 +604,7 @@ void ServerConfig::Fill()
        if (v == "splitmsg")
                OperSpyWhois = SPYWHOIS_SPLITMSG;
        else if (v == "on" || v == "yes")
-               OperSpyWhois = SPYWHOIS_NEWLINE;
+               OperSpyWhois = SPYWHOIS_SINGLEMSG;
        else
                OperSpyWhois = SPYWHOIS_NONE;
 
@@ -657,12 +670,13 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
                errstr << ce.GetReason();
        }
 
-       // write once here, to try it out and make sure its ok
-       ServerInstance->WritePID(this->PID);
-
        // Check errors before dealing with failed binds, since continuing on failed bind is wanted in some circumstances.
        valid = errstr.str().empty();
 
+       // write once here, to try it out and make sure its ok
+       if (valid)
+               ServerInstance->WritePID(this->PID);
+
        if (old)
        {
                // On first run, ports are bound later on
@@ -691,19 +705,16 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
        {
                std::string line;
                getline(errstr, line, '\n');
-               if (!line.empty())
-               {
-                       if (user)
-                               user->WriteServ("NOTICE %s :*** %s", user->nick.c_str(), line.c_str());
-                       else
-                               ServerInstance->SNO->WriteGlobalSno('a', line);
-               }
-
+               if (line.empty())
+                       continue;
+               // On startup, print out to console (still attached at this point)
                if (!old)
-               {
-                       // Starting up, so print it out so it's seen. XXX this is a bit of a hack.
                        printf("%s\n", line.c_str());
-               }
+               // If a user is rehashing, tell them directly
+               if (user)
+                       user->SendText(":%s NOTICE %s :*** %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), line.c_str());
+               // Also tell opers
+               ServerInstance->SNO->WriteGlobalSno('a', line);
        }
 
        errstr.clear();
@@ -727,7 +738,8 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
        ApplyModules(user);
 
        if (user)
-               user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str());
+               user->SendText(":%s NOTICE %s :*** Successfully rehashed server.",
+                       ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
        ServerInstance->SNO->WriteGlobalSno('a', "*** Successfully rehashed server.");
 }
 
@@ -878,7 +890,6 @@ void ConfigReaderThread::Finish()
                 * thoroughly!!!
                 */
                ServerInstance->XLines->CheckELines();
-               ServerInstance->XLines->CheckELines();
                ServerInstance->XLines->ApplyLines();
                ServerInstance->Res->Rehash();
                ServerInstance->ResetMaxBans();