Roadmap item "Fix jointhrottle to not try 'throttle' clients during a netmerge (requi...

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

diff --git a/src/server.cpp b/src/server.cpp
index ea2ec49284b0d8be96315a87b9754b98898a6e54..caeaa463bad4a0c47f23d3f9d0f5042649c6f077 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDserver */
+
 #include <signal.h>
 #include "exitcodes.h"
 #include "inspircd.h"
@@ -31,6 +33,7 @@ void InspIRCd::SignalHandler(int signal)
 
 void InspIRCd::Exit(int status)
 {
+       printf("exit with status %d\n", status);
 #ifdef WINDOWS
        delete WindowsIPC;
 #endif
@@ -38,8 +41,9 @@ void InspIRCd::Exit(int status)
        {
                this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
                this->Cleanup();
-    }
-    exit (status);
+       }
+       printf("Exit done.\n");
+       exit (status);
 }
 
 void InspIRCd::Rehash()
@@ -85,8 +89,8 @@ void InspIRCd::BuildISupport()
        // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
        std::stringstream v;
        v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
-       v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
-       v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+       v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets;
+       v << " AWAYLEN=" << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
        Config->data005 = v.str();
        FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
        Config->Update005();
@@ -173,9 +177,11 @@ std::string InspIRCd::GetUID()
 
                        if (current_uid[3] == 'Z')
                        {
-                               /* If we get to here, we need to wrap around to AAAA. */
-                               for(int j = 3; j < UUID_LENGTH - 1; j++)
-                                       current_uid[j] = 'A';
+                               /*
+                                * Ugh. We have run out of room.. roll back around to the
+                                * start of the UUID namespace. -- w00t
+                                */
+                               this->InitialiseUID();
 
                                /*
                                 * and now we need to break the inner for () to continue the while (),