X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_rehash.cpp;h=4d4b97c8ed245299d2a05a8b3656dfbb76128aa7;hb=187ece1bab24da3e9fda31053aaa04c5e4c401f9;hp=518b7fbf4f15a3560372312b5dc07386bb94969b;hpb=74c8913f72e6d48c88a01155ef5fe5ca20cc2bb1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index 518b7fbf4..4d4b97c8e 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -25,7 +25,7 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 
 CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
+	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
 	std::string parameter = "";
 	std::string old_disabled = ServerInstance->Config->DisabledCommands;
 	if (pcnt)
@@ -34,16 +34,20 @@ CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 	}
 	else
 	{
-		ServerInstance->WriteOpers("%s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
+		ServerInstance->WriteOpers("*** %s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
 		ServerInstance->CloseLog();
-		ServerInstance->OpenLog(NULL,0);
+		ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc);
 		ServerInstance->RehashUsersAndChans();
+		FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 		ServerInstance->Config->Read(false,user);
+		ServerInstance->Res->Rehash();
+		ServerInstance->ResetMaxBans();
+		ServerInstance->BuildISupport();
 	}
 	if (old_disabled != ServerInstance->Config->DisabledCommands)
 		InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
 
-	FOREACH_MOD(I_OnRehash,OnRehash(parameter));
+	FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
 
 	return CMD_SUCCESS;
 }