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 7f3721e77b7140925c3353a92d638c67e7b5d42c..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"
@@ -40,9 +37,11 @@
 #include "modules.h"
 #include "hash.h"
 
-static int mo_restart(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int me_restart(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int do_restart(struct Client *source_p, const char *servername);
+static const char restart_desc[] = "Provides the RESTART command to restart the server";
+
+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, 0,
@@ -50,30 +49,26 @@ struct Message restart_msgtab = {
 };
 
 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
+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)
@@ -83,33 +78,26 @@ mo_restart(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
                if (!server_p)
                {
                        sendto_one_numeric(source_p, ERR_NOSUCHSERVER, form_str(ERR_NOSUCHSERVER), parv[2]);
-                       return 0;
+                       return;
                }
 
                if (!IsMe(server_p))
                {
                        sendto_one(server_p, ":%s ENCAP %s RESTART %s", source_p->name, parv[2], parv[1]);
-                       return 0;
+                       return;
                }
        }
 
-       return do_restart(source_p, parv[1]);
+       do_restart(source_p, parv[1]);
 }
 
-static int
+static void
 me_restart(struct MsgBuf *msgbuf_p __unused, 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]);
+       do_restart(source_p, parv[1]);
 }
 
-static int
+static void
 do_restart(struct Client *source_p, const char *servername)
 {
        char buf[BUFSIZE];
@@ -119,7 +107,7 @@ do_restart(struct Client *source_p, const char *servername)
        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)
@@ -139,6 +127,4 @@ do_restart(struct Client *source_p, const char *servername)
 
        sprintf(buf, "Server RESTART by %s", get_client_name(source_p, HIDE_IP));
        restart(buf);
-
-       return 0;
 }