X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d3455e2c7e2f9040e1b7628d9cf52b26a24dcefc..133755685ef38d8f9ac79ac27c4505b9e96f81fd:/modules/m_restart.c

diff --git a/modules/m_restart.c b/modules/m_restart.c
index 365eb34..36dbf9c 100644
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -21,14 +21,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_restart.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -39,12 +37,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 };
@@ -57,10 +58,6 @@ DECLARE_MODULE_AV1(restart, NULL, NULL, restart_clist, NULL, NULL, "$Revision: 3
 static int
 mo_restart(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	char buf[BUFSIZE];
-	rb_dlink_node *ptr;
-	struct Client *target_p;
-
 	if(!IsOperDie(source_p))
 	{
 		sendto_one(source_p, form_str(ERR_NOPRIVS),
@@ -73,7 +70,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;
+
+	/* this makes sure both servernames match otherwise weirdness will occur */
+	if(irccmp(servername, me.name))
 	{
 		sendto_one_notice(source_p, ":Mismatch on /restart %s", me.name);
 		return 0;