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 10e914d421f8b619b8270fa797a57fd56c97b040..8ac865f9e1d35a73bce4eee46dd0ff007c49b1b8 100644 (file)
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -20,14 +20,12 @@
  *  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"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "logger.h"
 #include "s_conf.h"
@@ -36,45 +34,82 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_newconf.h"
+#include "hash.h"
+
+static const char die_desc[] = "Provides the DIE command to allow an operator to shutdown a server";
 
-static int mo_die(struct Client *, struct Client *, int, const char **);
+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,
-       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_die, 0}}
+       "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
-mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
 {
-       struct Client *target_p;
-       rb_dlink_node *ptr;
-
        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)
+       {
+               /* Remote die. Pass it along. */
+               struct Client *server_p = find_server(NULL, parv[2]);
+               if (!server_p)
+               {
+                       sendto_one_numeric(source_p, ERR_NOSUCHSERVER, form_str(ERR_NOSUCHSERVER), parv[2]);
+                       return;
+               }
+
+               if (!IsMe(server_p))
+               {
+                       sendto_one(server_p, ":%s ENCAP %s DIE %s", source_p->name, parv[2], parv[1]);
+                       return;
+               }
+       }
+
+        do_die(source_p, parv[1]);
+}
+
+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;
        }
-       else if(irccmp(parv[1], me.name))
+
+       do_die(source_p, parv[1]);
+}
+
+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;
 }