cmd_rehash, m_spanningtree Fix REHASH messages duplicating at each hop

Fixes #375 reported by @JDowny

1 files changed, 3 insertions, 4 deletions

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 1fa6e5731..abf0b7876 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -94,8 +94,6 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
 
 		ServerInstance->ConfigThread = new ConfigReaderThread(user->uuid);
 		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
-
-		return CMD_SUCCESS;
 	}
 	else
 	{
@@ -107,9 +105,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;
 }