X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc200171d7c40be3b204460f9c14d5d37e771866..d25c6eb1b223d1a0993dde9a28c97ef95e54bceb:/modules/core/m_die.c

diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index ec81e79..5052121 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -27,21 +27,24 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
 #include "s_newconf.h"
+#include "hash.h"
 
 static int mo_die(struct Client *, struct Client *, int, const char **);
+static int me_die(struct Client *, struct Client *, int, const char **);
+static int 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}}
+	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_die, 1}, {mo_die, 0}}
 };
 
 mapi_clist_av1 die_clist[] = { &die_msgtab, NULL };
@@ -54,9 +57,6 @@ DECLARE_MODULE_AV1(die, NULL, NULL, die_clist, NULL, NULL, "$Revision: 3295 $");
 static int
 mo_die(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");
@@ -68,39 +68,50 @@ mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, cons
 		sendto_one_notice(source_p, ":Need server name /die %s", me.name);
 		return 0;
 	}
-	else if(irccmp(parv[1], me.name))
-	{
-		sendto_one_notice(source_p, ":Mismatch on /die %s", me.name);
-		return 0;
-	}
 
-	RB_DLINK_FOREACH(ptr, lclient_list.head)
-	{
-		target_p = ptr->data;
+        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 0;
+                }
+                if (!IsMe(server_p))
+                {
+                        sendto_one(server_p, ":%s ENCAP %s DIE %s", source_p->name, parv[2], parv[1]);
+                        return 0;
+                }
+        }
 
-		sendto_one_notice(target_p, ":Server Terminating. %s", get_client_name(source_p, HIDE_IP));
-	}
+        return do_die(source_p, parv[1]);
+}
 
-	RB_DLINK_FOREACH(ptr, serv_list.head)
-	{
-		target_p = ptr->data;
+static int
+me_die(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;
+        }
 
-		sendto_one(target_p, "SQUIT %s :Terminated by %s",
-			   use_id(target_p),
-			   get_client_name(source_p, HIDE_IP));
-	}
+        return do_die(source_p, parv[1]);
+}
 
-	/*
-	 * XXX we called flush_connections() here. Read server_reboot()
-	 * for an explanation as to what we should do.
-	 *     -- adrian
-	 */
-	ilog(L_MAIN, "Server terminated by %s", get_oper_name(source_p));
+static int
+do_die(struct Client *source_p, const char *servername)
+{
+	/* this makes sure both servernames match otherwise weirdness will occur */
+	if(irccmp(servername, me.name))
+	{
+		sendto_one_notice(source_p, ":Mismatch on /die %s", me.name);
+		return 0;
+	}
 
-	/* this is a normal exit, tell the os it's ok */
-	unlink(pidFileName);
-	exit(0);
-	/* NOT REACHED */
+	ircd_shutdown(get_client_name(source_p, HIDE_IP));
 
 	return 0;
 }