Unify oper:{global,local}_kill

[solanum.git] / modules / core / m_die.c

diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index 997eaa6db5c6339f6cd8daeb60370da803ed78c2..8ac865f9e1d35a73bce4eee46dd0ff007c49b1b8 100644 (file)
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_die.c 3295 2007-03-28 14:45:46Z jilles $
  */
 
 #include "stdinc.h"
@@ -38,35 +36,37 @@
 #include "s_newconf.h"
 #include "hash.h"
 
-static int mo_die(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int me_die(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int do_die(struct Client *, const char *);
+static const char die_desc[] = "Provides the DIE command to allow an operator to shutdown a server";
+
+static void mo_die(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_die(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void do_die(struct Client *, const char *);
 
 static struct Message die_msgtab = {
-       "DIE", 0, 0, 0, MFLG_SLOW,
+       "DIE", 0, 0, 0, 0,
        {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_die, 1}, {mo_die, 0}}
 };
 
 mapi_clist_av1 die_clist[] = { &die_msgtab, NULL };
 
-DECLARE_MODULE_AV1(die, NULL, NULL, die_clist, NULL, NULL, "$Revision: 3295 $");
+DECLARE_MODULE_AV2(die, NULL, NULL, die_clist, NULL, NULL, NULL, NULL, die_desc);
 
 /*
  * mo_die - DIE command handler
  */
-static int
+static void
 mo_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
 {
        if(!IsOperDie(source_p))
        {
                sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "die");
-               return 0;
+               return;
        }
 
        if(parc < 2 || EmptyString(parv[1]))
        {
                sendto_one_notice(source_p, ":Need server name /die %s", me.name);
-               return 0;
+               return;
        }
 
        if(parc > 2)
@@ -76,42 +76,40 @@ mo_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struc
                if (!server_p)
                {
                        sendto_one_numeric(source_p, ERR_NOSUCHSERVER, form_str(ERR_NOSUCHSERVER), parv[2]);
-                       return 0;
+                       return;
                }
 
                if (!IsMe(server_p))
                {
                        sendto_one(server_p, ":%s ENCAP %s DIE %s", source_p->name, parv[2], parv[1]);
-                       return 0;
+                       return;
                }
        }
 
-        return do_die(source_p, parv[1]);
+        do_die(source_p, parv[1]);
 }
 
-static int
+static void
 me_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
 {
        if(!find_shared_conf(source_p->username, source_p->host, source_p->servptr->name, SHARED_DIE))
        {
                sendto_one_notice(source_p, ":*** You do not have an appropriate shared block to "
                                "remotely shut down this server.");
-               return 0;
+               return;
        }
 
-       return do_die(source_p, parv[1]);
+       do_die(source_p, parv[1]);
 }
 
-static int
+static void
 do_die(struct Client *source_p, const char *servername)
 {
        if(irccmp(servername, me.name))
        {
                sendto_one_notice(source_p, ":Mismatch on /die %s", me.name);
-               return 0;
+               return;
        }
 
        ircd_shutdown(get_client_name(source_p, HIDE_IP));
-
-       return 0;
 }