X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=75e404b802885d578b9e3ae2d1554047daf148b7;hb=b686288b3f6bbc49bd689df2d5b3d8ce9d62db4e;hp=d583d87c3ebf1633ca90abf04d1ed2be00810f61;hpb=7d7250484c352c13830e63ae41ee8faae40a9bd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index d583d87c3..75e404b80 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDserver */
+/* $Core */
 
 #include <signal.h>
 #include "exitcodes.h"
@@ -36,6 +36,7 @@ void InspIRCd::Exit(int status)
 #ifdef WINDOWS
 	if (WindowsIPC)
 		delete WindowsIPC;
+	SetServiceStopped(status);
 #endif
 	if (this)
 	{
@@ -47,17 +48,19 @@ void InspIRCd::Exit(int status)
 
 void RehashHandler::Call(const std::string &reason)
 {
+	Server->RehashFinishMutex->Lock();
 	Server->SNO->WriteToSnoMask('A', "Rehashing config file %s %s",ServerConfig::CleanFilename(Server->ConfigFileName), reason.c_str());
 	Server->RehashUsersAndChans();
 	FOREACH_MOD_I(Server, I_OnGarbageCollect, OnGarbageCollect());
 	if (!Server->ConfigThread)
 	{
-		Server->Config->RehashUser = NULL;
+		Server->Config->RehashUserUID = "";
 		Server->Config->RehashParameter = "";
 
-		Server->ConfigThread = new ConfigReaderThread(Server, false, NULL);
+		Server->ConfigThread = new ConfigReaderThread(Server, false, "");
 		Server->Threads->Create(Server->ConfigThread);
 	}
+	Server->RehashFinishMutex->Unlock();
 }
 
 void InspIRCd::RehashServer()
@@ -85,7 +88,7 @@ void InspIRCd::BuildISupport()
 	std::stringstream v;
 	v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax;
 	v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic << " KICKLEN=" << Config->Limits.MaxKick << " MAXTARGETS=" << Config->MaxTargets;
-	v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+	v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
 	Config->data005 = v.str();
 	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
 	Config->Update005();