Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 3966021b51e8d89e5a79edae39c21a668d1acc74..a8d3f14e6ea9bd25c7c0978f64addcc42b97b376 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -14,40 +14,45 @@
  * ---------------------------------------------------
  */
 
-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"
 
 extern ServerConfig* Config;
+extern std::vector<userrec*> all_opers;
 
 void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
 {
-       log(DEBUG,"die: %s",user->nick);
        if (!strcmp(parameters[0],Config->diepass))
        {
-               WriteOpers("*** DIE command from %s!%s@%s, terminating...",user->nick,user->ident,user->host);
+               log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, 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.
+                */
+               
+               for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+               {
+                       userrec* a = *i;
+                       
+                       if (IS_LOCAL(a) && (a->modebits & UM_SERVERNOTICE))
+                       {
+                               WriteServ(a->fd, "NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
+                               a->FlushWriteBuf();
+                       }
+               }
+               
                sleep(Config->DieDelay);
                Exit(ERROR);
        }
        else
        {
+               log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
                WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
        }
 }
-
-