1) Fix for nickname overruled with new cullList stuff -- we have to change their...

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 06b8b79e86deb61a3aac0bf765c9100a08fcadf1..d9aecb4be4dc4490614268954a037c2d44191887 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -17,14 +14,15 @@
 #include "configreader.h"
 #include "users.h"
 #include "commands/cmd_die.h"
-
-
+#include "exitcodes.h"
 
 extern "C" command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_die(Instance);
 }
 
+/** Handle /DIE
+ */
 CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (!strcmp(parameters[0],ServerInstance->Config->diepass))
@@ -46,8 +44,10 @@ CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                }
                
-               sleep(ServerInstance->Config->DieDelay);
-               InspIRCd::Exit(ERROR);
+               if (ServerInstance->Config->DieDelay)
+                       sleep(ServerInstance->Config->DieDelay);
+
+               InspIRCd::Exit(EXIT_STATUS_DIE);
        }
        else
        {