Set topic timestamp on newly created channels to a dummy value to work around bug...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 0c951055338ffee7f30816998497367128ffef69..d8f7339297cd34fffca141f29df7d308f889815a 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -823,7 +823,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                {"disabled",    "commands",     "",                     new ValueContainerChar (this->DisabledCommands),        DT_CHARPTR,  NoValidation},
                {"disabled",    "usermodes",    "",                     new ValueContainerChar (disabledumodes),                DT_CHARPTR,  ValidateDisabledUModes},
                {"disabled",    "chanmodes",    "",                     new ValueContainerChar (disabledcmodes),                DT_CHARPTR,  ValidateDisabledCModes},
-               {"disabled",    "fakenonexistant",      "0",                    new ValueContainerBool (&this->DisabledDontExist),              DT_BOOLEAN,  NoValidation},
+               {"disabled",    "fakenonexistant",      "0",            new ValueContainerBool (&this->DisabledDontExist),              DT_BOOLEAN,  NoValidation},
 
                {"security",            "runasuser",    "",             new ValueContainerChar(this->SetUser),                          DT_CHARPTR, NoValidation},
                {"security",            "runasgroup",   "",             new ValueContainerChar(this->SetGroup),                         DT_CHARPTR, NoValidation},
@@ -834,7 +834,8 @@ 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},
+               {"security",    "restrictbannedusers",  "1",            new ValueContainerBool (&this->RestrictBannedUsers),            DT_BOOLEAN,  NoValidation},
+               {"security",    "genericoper",  "0",                    new ValueContainerBool (&this->GenericOper),            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},
@@ -1005,7 +1006,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                        if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi))
                                throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information.");
 
-                       ServerInstance->Threads->Lock();
+                       // XXX: ServerInstance->Threads->Lock();
                        switch (dt)
                        {
                                case DT_NOSPACES:
@@ -1034,7 +1035,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                        ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
                                        if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString(), MAXBUF))
                                        {
-                                               ServerInstance->Threads->Unlock();
+                                               // XXX: ServerInstance->Threads->Unlock();
                                                throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name");
                                        }
                                        vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
@@ -1067,7 +1068,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                        }
                        /* We're done with this now */
                        delete Values[Index].val;
-                       ServerInstance->Threads->Unlock();
+                       // XXX: ServerInstance->Threads->Unlock();
                }
 
                /* Read the multiple-tag items (class tags, connect tags, etc)
@@ -1076,9 +1077,9 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                 */
                for (int Index = 0; MultiValues[Index].tag; ++Index)
                {
-                       ServerInstance->Threads->Lock();
+                       // XXX: ServerInstance->Threads->Lock();
                        MultiValues[Index].init_function(this, MultiValues[Index].tag);
-                       ServerInstance->Threads->Unlock();
+                       // XXX: ServerInstance->Threads->Unlock();
 
                        int number_of_tags = ConfValueEnum(newconfig, MultiValues[Index].tag);
 
@@ -1093,7 +1094,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                        dt &= ~DT_ALLOW_NEWLINE;
                                        dt &= ~DT_ALLOW_WILD;
 
-                                       ServerInstance->Threads->Lock();
+                                       // XXX: ServerInstance->Threads->Lock();
                                        /* We catch and rethrow any exception here just so we can free our mutex
                                         */
                                        try
@@ -1172,10 +1173,10 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                        }
                                        catch (CoreException &e)
                                        {
-                                               ServerInstance->Threads->Unlock();
+                                               // XXX: ServerInstance->Threads->Unlock();
                                                throw e;
                                        }
-                                       ServerInstance->Threads->Unlock();
+                                       // XXX: ServerInstance->Threads->Unlock();
                                }
                                MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype);
                        }
@@ -1195,7 +1196,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                return;
        }
 
-       ServerInstance->Threads->Lock();
+       // XXX: ServerInstance->Threads->Lock();
        for (int i = 0; i < ConfValueEnum(newconfig, "type"); ++i)
        {
                char item[MAXBUF], classn[MAXBUF], classes[MAXBUF];
@@ -1238,7 +1239,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
        /* If we succeeded, set the ircd config to the new one */
        this->config_data = newconfig;
 
-       ServerInstance->Threads->Unlock();
+       // XXX: ServerInstance->Threads->Unlock();
 
        // write once here, to try it out and make sure its ok
        ServerInstance->WritePID(this->PID);
@@ -1253,7 +1254,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
 
                if (pl.size() && !useruid.empty())
                {
-                       ServerInstance->Threads->Lock();
+                       // XXX: ServerInstance->Threads->Lock();
                        User* user = ServerInstance->FindNick(useruid);
                        if (user)
                        {
@@ -1265,10 +1266,10 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                        user->WriteServ("NOTICE %s :*** %d.   Address: %s        Reason: %s", user->nick.c_str(), j, i->first.empty() ? "<all>" : i->first.c_str(), i->second.c_str());
                                }
                        }
-                       ServerInstance->Threads->Unlock();
+                       // XXX: ServerInstance->Threads->Unlock();
                }
 
-               ServerInstance->Threads->Lock();
+               // XXX: ServerInstance->Threads->Lock();
                if (!removed_modules.empty())
                {
                        for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
@@ -1333,7 +1334,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                }
                        }
                }
-               ServerInstance->Threads->Unlock();
+               // XXX: ServerInstance->Threads->Unlock();
 
        }
 
@@ -2371,7 +2372,5 @@ bool DoneELine(ServerConfig* conf, const char* tag)
 void ConfigReaderThread::Run()
 {
        ServerInstance->Config->Read(do_bail, TheUserUID);
-       ServerInstance->Threads->Lock();
-       this->SetExitFlag();
-       ServerInstance->Threads->Unlock();
+       done = true;
 }