X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=463f9d82fdcbc130a85131d0005c4aa61c79b84f;hb=d6bec26bc7c329c0d3d6d84203ecd12a26dac91b;hp=875755ed77f497c9bd1ffb65e49a5163c033a3b1;hpb=2a0c6c52d045fe3a6dda9bf0209be250fa486d6b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 875755ed7..463f9d82f 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -48,10 +48,6 @@
 #include "caller.h"
 #include "testsuite.h"
 
-using irc::sockets::insp_ntoa;
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_sockaddr;
-
 InspIRCd* SI = NULL;
 int* mysig = NULL;
 
@@ -458,7 +454,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	ThreadEngineFactory* tef = new ThreadEngineFactory();
 	this->Threads = tef->Create(this);
 	delete tef;
-	this->Mutexes = new MutexEngine(this);
+	this->Mutexes = new MutexFactory(this);
 
 	/* Default implementation does nothing */
 	this->PI = new ProtocolInterface(this);
@@ -626,7 +622,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	/* During startup we don't actually initialize this
 	 * in the thread engine.
 	 */
-	this->ConfigThread = new ConfigReaderThread(this, true, NULL);
+	this->ConfigThread = new ConfigReaderThread(this, true, "");
 	ConfigThread->Run();
 	delete ConfigThread;
 	this->ConfigThread = NULL;
@@ -778,7 +774,8 @@ int InspIRCd::Run()
 			this->Res->Rehash();
 			this->ResetMaxBans();
 			InitializeDisabledCommands(Config->DisabledCommands, this);
-			FOREACH_MOD_I(this, I_OnRehash, OnRehash(Config->RehashUser, Config->RehashParameter));
+			User* user = !Config->RehashUserUID.empty() ? FindNick(Config->RehashUserUID) : NULL;
+			FOREACH_MOD_I(this, I_OnRehash, OnRehash(user, Config->RehashParameter));
 			this->BuildISupport();
 		}