Merge pull request #1018 from SaberUK/insp20+hidekills

[user/henk/code/inspircd.git] / src / commands / cmd_rehash.cpp

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 2026e7a00093e677719be03ee7587a03a9422c92..abf0b7876f88ac78a7a55f7d477908b06b5c3759 100644 (file)
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -88,16 +88,12 @@ 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->ProcessedMotdEscapes = false; // Reprocess our motd file --Justasic
                ServerInstance->RehashUsersAndChans();
                FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 
 
                ServerInstance->ConfigThread = new ConfigReaderThread(user->uuid);
                ServerInstance->Threads->Start(ServerInstance->ConfigThread);
-
-               return CMD_SUCCESS;
        }
        else
        {
@@ -109,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;
 }