Add <auditorium:operoverride> setting, based on patch contributed by Sm0ke0ut

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 7eb52ebc8f0451f5c5dc115caf238f96965f0168..15ab63776acbed5dd032855a55f4898986562465 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -308,7 +308,10 @@ InspIRCd::InspIRCd(int argc, char** argv)
        delete SEF;
 
        this->s_signal = 0;
-
+       
+       // Create base manager classes early, so nothing breaks
+       this->Users = new UserManager(this);
+       
        this->Users->unregistered_count = 0;
 
        this->Users->clientlist = new user_hash();
@@ -325,7 +328,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->Timers = new TimerManager(this);
        this->Parser = new CommandParser(this);
        this->XLines = new XLineManager(this);
-       this->Users = new UserManager(this);
 
        this->Config->argv = argv;
        this->Config->argc = argc;
@@ -419,7 +421,9 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
        printf_c("(C) InspIRCd Development Team.\033[0m\n\n");
-       printf_c("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey, Burlex\033[0m\n");
+       printf_c("Developers:\n");
+       printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\n");
+       printf_c("\t\033[1;32mpippijn, peavey, aquanight, fez\033[0m\n\n");
        printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
 
        /* Set the finished argument values */
@@ -431,9 +435,9 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->Modes = new ModeParser(this);
 
        /* set up fake client (uid is incorrect at this point,
-         * until after config is read. we set up the user again
-         * at that point 
-         */
+        * until after config is read. we set up the user again
+        * at that point 
+        */
        this->FakeClient = new User(this);
        this->FakeClient->SetFd(FD_MAGIC_NUMBER);
 
@@ -476,42 +480,42 @@ InspIRCd::InspIRCd(int argc, char** argv)
        /* We have all the files we can get, initiate pass 1 */
        Config->Read(true, NULL, 1);
 
-        this->AddServerName(Config->ServerName);
+       this->AddServerName(Config->ServerName);
 
-        /*
-         * Initialise SID/UID.
-         * For an explanation as to exactly how this works, and why it works this way, see GetUID().
-         *   -- w00t
-         */
-        if (*Config->sid)
-        {
+       /*
+        * Initialise SID/UID.
+        * For an explanation as to exactly how this works, and why it works this way, see GetUID().
+        *   -- w00t
+        */
+       if (*Config->sid)
+       {
        }
-        else
-        {
+       else
+       {
                // Generate one
                size_t sid = 0;
 
-                for (const char* x = Config->ServerName; *x; ++x)
-                        sid = 5 * sid + *x;
-                for (const char* y = Config->ServerDesc; *y; ++y)
-                        sid = 5 * sid + *y;
-                sid = sid % 999;
+               for (const char* x = Config->ServerName; *x; ++x)
+                       sid = 5 * sid + *x;
+               for (const char* y = Config->ServerDesc; *y; ++y)
+                       sid = 5 * sid + *y;
+               sid = sid % 999;
 
                Config->sid[0] = (char)(sid / 100 + 48);
                Config->sid[1] = (char)(((sid / 10) % 10) + 48);
                Config->sid[2] = (char)(sid % 10 + 48);
-        }
+       }
 
-        this->InitialiseUID();
+       this->InitialiseUID();
 
-        /* set up fake client again this time with the correct uid */
-        delete FakeClient;
-        this->FakeClient = new User(this);
-        this->FakeClient->SetFd(FD_MAGIC_NUMBER);
+       /* set up fake client again this time with the correct uid */
+       delete FakeClient;
+       this->FakeClient = new User(this);
+       this->FakeClient->SetFd(FD_MAGIC_NUMBER);
 
-        // Get XLine to do it's thing.
-        this->XLines->CheckELines();
-        this->XLines->ApplyLines();
+       // Get XLine to do it's thing.
+       this->XLines->CheckELines();
+       this->XLines->ApplyLines();
 
 
        CheckDie();