From: William Pitcock <redacted>
Date: Tue, 12 Jan 2016 06:04:54 +0000 (-0600)
Subject: Allow remote DIE and RESTART (from ircd-seven)
X-Git-Url: https://jfr.im/git/solanum.git/commitdiff_plain/cc7ae51cdced1824bee59e0b5cc5f17286e80898?hp=3b1c2aa62c69d932c89fb69e48d3abc51996706f

Allow remote DIE and RESTART (from ircd-seven)
---

diff --git a/doc/reference.conf b/doc/reference.conf
index 1b94449f..5f9eab2b 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -672,6 +672,7 @@ shared {
 	 *    tdline  - allow setting temp dlines
 	 *    undline - allow removing dlines
 	 *    grant   - allow granting operator status
+	 *    die     - allow remote DIE/RESTART
 	 *    none    - disallow everything
 	 */
 
diff --git a/include/s_newconf.h b/include/s_newconf.h
index 3dbcab71..2a55a830 100644
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -97,6 +97,7 @@ struct remote_conf
 #define SHARED_PDLINE	0x1000
 #define SHARED_UNDLINE	0x2000
 #define SHARED_GRANT	0x4000
+#define SHARED_DIE	0x8000
 
 #define SHARED_ALL	(SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\
 			SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\
diff --git a/ircd/newconf.c b/ircd/newconf.c
index f6cbd44b..42244f85 100644
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -390,6 +390,7 @@ static struct mode_table shared_table[] =
 	{ "locops",	SHARED_LOCOPS	},
 	{ "rehash",	SHARED_REHASH	},
 	{ "grant",	SHARED_GRANT	},
+	{ "die",	SHARED_DIE	},
 	{ "all",	SHARED_ALL	},
 	{ "none",	0		},
 	{NULL, 0}
diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index e8aa279e..ef4394f3 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -36,12 +36,15 @@
 #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 };
@@ -65,7 +68,44 @@ 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))
+
+	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;
+		}
+	}
+
+        return do_die(source_p, parv[1]);
+}
+
+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;
+	}
+
+	return do_die(source_p, parv[1]);
+}
+
+static int
+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;
diff --git a/modules/m_restart.c b/modules/m_restart.c
index e175e9d9..a8ca8b08 100644
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -38,12 +38,15 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "hash.h"
 
 static int mo_restart(struct Client *, struct Client *, int, const char **);
+static int me_restart(struct Client *, struct Client *, int, const char **);
+static int do_restart(struct Client *source_p, const char *servername);
 
 struct Message restart_msgtab = {
 	"RESTART", 0, 0, 0, MFLG_SLOW,
-	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_restart, 0}}
+	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_restart, 1}, {mo_restart, 0}}
 };
 
 mapi_clist_av1 restart_clist[] = { &restart_msgtab, NULL };
@@ -72,7 +75,48 @@ mo_restart(struct Client *client_p, struct Client *source_p, int parc, const cha
 		sendto_one_notice(source_p, ":Need server name /restart %s", me.name);
 		return 0;
 	}
-	else if(irccmp(parv[1], me.name))
+
+	if(parc > 2)
+	{
+		/* Remote restart. 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 RESTART %s", source_p->name, parv[2], parv[1]);
+			return 0;
+		}
+	}
+
+	return do_restart(source_p, parv[1]);
+}
+
+static int
+me_restart(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 restart this server.");
+		return 0;
+	}
+
+	return do_restart(source_p, parv[1]);
+}
+
+static int
+do_restart(struct Client *source_p, const char *servername)
+{
+	char buf[BUFSIZE];
+	rb_dlink_node *ptr;
+	struct Client *target_p;
+
+	if(irccmp(servername, me.name))
 	{
 		sendto_one_notice(source_p, ":Mismatch on /restart %s", me.name);
 		return 0;
diff --git a/modules/m_stats.c b/modules/m_stats.c
index a59d604b..cdb64195 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -1054,6 +1054,7 @@ static struct shared_flags shared_flagtable[] =
 	{ SHARED_PDLINE,	'D' },
 	{ SHARED_UNDLINE,	'E' },
 	{ SHARED_GRANT,		'G' },
+	{ SHARED_DIE,		'I' },
 	{ 0,			'\0'}
 };