m_list: fail on invalid parameters

[solanum.git] / modules / m_restart.c

diff --git a/modules/m_restart.c b/modules/m_restart.c
index e175e9d991070ab2269d5d4d9b2dd483bf71186a..3bdb1df2356d303eb023c70d7fc3a324f9371500 100644 (file)
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -20,13 +20,10 @@
  *  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_restart.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"
-#include "common.h"
 #include "match.h"
 #include "ircd.h"
 #include "numeric.h"
@@ -38,44 +35,79 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "hash.h"
+
+static const char restart_desc[] = "Provides the RESTART command to restart the server";
 
-static int mo_restart(struct Client *, struct Client *, int, const char **);
+static void mo_restart(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_restart(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void 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}}
+       "RESTART", 0, 0, 0, 0,
+       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_restart, 1}, {mo_restart, 0}}
 };
 
 mapi_clist_av1 restart_clist[] = { &restart_msgtab, NULL };
-DECLARE_MODULE_AV1(restart, NULL, NULL, restart_clist, NULL, NULL, "$Revision: 3161 $");
+
+DECLARE_MODULE_AV2(restart, NULL, NULL, restart_clist, NULL, NULL, NULL, NULL, restart_desc);
 
 /*
  * mo_restart
- *
  */
-static int
-mo_restart(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_restart(struct MsgBuf *msgbuf_p, 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),
                           me.name, source_p->name, "die");
-               return 0;
+               return;
        }
 
        if(parc < 2 || EmptyString(parv[1]))
        {
                sendto_one_notice(source_p, ":Need server name /restart %s", me.name);
-               return 0;
+               return;
+       }
+
+       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;
+               }
+
+               if (!IsMe(server_p))
+               {
+                       sendto_one(server_p, ":%s ENCAP %s RESTART %s", source_p->name, parv[2], parv[1]);
+                       return;
+               }
        }
-       else if(irccmp(parv[1], me.name))
+
+       do_restart(source_p, parv[1]);
+}
+
+static void
+me_restart(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
+{
+       do_restart(source_p, parv[1]);
+}
+
+static void
+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;
+               return;
        }
 
        RB_DLINK_FOREACH(ptr, lclient_list.head)
@@ -93,8 +125,6 @@ mo_restart(struct Client *client_p, struct Client *source_p, int parc, const cha
                           me.name, get_client_name(source_p, HIDE_IP));
        }
 
-       rb_sprintf(buf, "Server RESTART by %s", get_client_name(source_p, HIDE_IP));
+       sprintf(buf, "Server RESTART by %s", get_client_name(source_p, HIDE_IP));
        restart(buf);
-
-       return 0;
 }