X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_rehash.cpp;h=1ad96d794b10534e375216bafbb7e4d88a3dbe24;hb=01b71ef43f9413c5f0ee2fc3e484ef6e7bdeb1f6;hp=1fa6e5731b8c730c07c7ac372c6ef83dee3d14c6;hpb=c79475caa82104e82f9a914b7673bd61f7a1f01f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 1fa6e5731..1ad96d794 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -88,14 +88,11 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
 		/* Don't do anything with the logs here -- logs are restarted
 		 * after the config thread has completed.
 		 */
-		ServerInstance->RehashUsersAndChans();
 		FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 
 
 		ServerInstance->ConfigThread = new ConfigReaderThread(user->uuid);
 		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
-
-		return CMD_SUCCESS;
 	}
 	else
 	{
@@ -107,9 +104,10 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
 			user->WriteServ("NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick.c_str());
 		else
 			ServerInstance->PI->SendUserNotice(user, "*** Could not rehash: A rehash is already in progress.");
-
-		return CMD_FAILURE;
 	}
+
+	// Always return success so spanningtree forwards an incoming REHASH even if we failed
+	return CMD_SUCCESS;
 }