Replace most checks for +o with oper:general

[solanum.git] / modules / m_restart.c

diff --git a/modules/m_restart.c b/modules/m_restart.c
index aac90db83c0a6ce0bcbaf6e95e32037d131a7225..3910e299b1d136c826922233684ff0c5f0c72f82 100644 (file)
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -20,77 +20,111 @@
  *  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 254 2005-09-21 23:35:12Z 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"
 #include "s_newconf.h"
 #include "restart.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #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: 254 $");
+
+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];
-       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(source_p, ":%s NOTICE %s :Need server name /restart %s",
-                          me.name, source_p->name, me.name);
-               return 0;
+               sendto_one_notice(source_p, ":Need server name /restart %s", me.name);
+               return;
        }
-       else if(irccmp(parv[1], me.name))
+
+       if(parc > 2)
        {
-               sendto_one(source_p, ":%s NOTICE %s :Mismatch on /restart %s",
-                          me.name, source_p->name, me.name);
-               return 0;
+               /* 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;
+               }
        }
 
-       DLINK_FOREACH(ptr, lclient_list.head)
+       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[])
+{
+       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;
+       }
+
+       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;
+       }
+
+       RB_DLINK_FOREACH(ptr, lclient_list.head)
        {
                target_p = ptr->data;
 
-               sendto_one(target_p,
-                          ":%s NOTICE %s :Server Restarting. %s",
-                          me.name, target_p->name, get_client_name(source_p, HIDE_IP));
+               sendto_one_notice(target_p, ":Server Restarting. %s", get_client_name(source_p, HIDE_IP));
        }
 
-       DLINK_FOREACH(ptr, serv_list.head)
+       RB_DLINK_FOREACH(ptr, serv_list.head)
        {
                target_p = ptr->data;
 
@@ -98,8 +132,6 @@ mo_restart(struct Client *client_p, struct Client *source_p, int parc, const cha
                           me.name, get_client_name(source_p, HIDE_IP));
        }
 
-       ircsprintf(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;
 }