OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

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

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index 815e241f0d51023d9fec138be51b05bc001e8adf..34789b0eaca8f0d6b46a8b4771f122d125830650 100644 (file)
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -18,15 +19,15 @@
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_rehash(Instance);
 }
 
 CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
-       std::string parameter = "";
+       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,7 +35,7 @@ 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(ServerInstance->Config->argv, ServerInstance->Config->argc);
                ServerInstance->RehashUsersAndChans();
@@ -42,13 +43,14 @@ CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
                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(user, parameter));
 
+       ServerInstance->BuildISupport();
+
        return CMD_SUCCESS;
 }