Revert "LIST: since we now have channel::strip_topic_colors, don't unconditionally...

[solanum.git] / modules / m_restart.c

diff --git a/modules/m_restart.c b/modules/m_restart.c
index 97f47db037afb55ab0cc66ea76567ca28cd09ede..a8ca8b08ee8c1495fc4df920587e70eb3a4ce2b9 100644 (file)
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -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;