Fix passing wrong instance to resolver

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index bc8f5809984f2551971bbfc3522d0f43f36799df..93b9f498795c64e904eeca88d80a51935f497f2a 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -14,33 +14,23 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
+#include <unistd.h>
 #include <string>
+#include <vector>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "wildcard.h"
-#include "message.h"
 #include "commands.h"
-#include "inspstring.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_die.h"
+#include "commands/cmd_die.h"
 
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern std::vector<userrec*> all_opers;
 
-void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       if (!strcmp(parameters[0],Config->diepass))
+       if (!strcmp(parameters[0],ServerInstance->Config->diepass))
        {
-               log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, Config->DieDelay);
+               log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, ServerInstance->Config->DieDelay);
                
                /* This would just be WriteOpers(), but as we just sleep() and then die then the write buffers never get flushed.
                 * so we iterate the oper list, writing the message and immediately trying to flush their write buffer.
@@ -50,14 +40,14 @@ void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
                {
                        userrec* a = *i;
                        
-                       if (IS_LOCAL(a) && (a->modebits & UM_SERVERNOTICE))
+                       if (IS_LOCAL(a) && (a->modes[UM_SERVERNOTICE]))
                        {
-                               WriteServ(a->fd, "NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
+                               a->WriteServ("NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
                                a->FlushWriteBuf();
                        }
                }
                
-               sleep(Config->DieDelay);
+               sleep(ServerInstance->Config->DieDelay);
                Exit(ERROR);
        }
        else