Unify oper:{global,local}_kill

[solanum.git] / modules / core / m_kill.c

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 272d1aa0631e20ae83314769ef394023429404f9..060310bc58ab5fbf9cd2a9dd62bcd8b051754ade 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -20,8 +20,6 @@
  *  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_kill.c 3408 2007-04-14 20:58:56Z jilles $
  */
 
 #include "stdinc.h"
@@ -40,16 +38,18 @@
 #include "modules.h"
 #include "s_newconf.h"
 
+static const char kill_desc[] = "Provides the KILL command to remove a user from the network";
+
 static int h_can_kill;
 static char buf[BUFSIZE];
 
-static int ms_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mo_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void relay_kill(struct Client *, struct Client *, struct Client *,
                       const char *, const char *);
 
 struct Message kill_msgtab = {
-       "KILL", 0, 0, 0, MFLG_SLOW,
+       "KILL", 0, 0, 0, 0,
        {mg_unreg, mg_not_oper, {ms_kill, 2}, {ms_kill, 2}, mg_ignore, {mo_kill, 2}}
 };
 
@@ -60,14 +60,14 @@ mapi_hlist_av1 kill_hlist[] = {
        { NULL, NULL},
 };
 
-DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, kill_hlist, NULL, "$Revision: 3408 $");
+DECLARE_MODULE_AV2(kill, NULL, NULL, kill_clist, kill_hlist, NULL, NULL, NULL, kill_desc);
 
 /*
 ** mo_kill
 **      parv[1] = kill victim
 **      parv[2] = kill path
 */
-static int
+static void
 mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
@@ -78,10 +78,10 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
        user = parv[1];
 
-       if(!IsOperLocalKill(source_p))
+       if(!IsOperKill(source_p))
        {
-               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "local_kill");
-               return 0;
+               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kill");
+               return;
        }
 
        if(!EmptyString(parv[2]))
@@ -109,19 +109,11 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                        else
                                sendto_one_numeric(source_p, ERR_NOSUCHNICK,
                                                   form_str(ERR_NOSUCHNICK), user);
-                       return 0;
+                       return;
                }
                sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
        }
 
-       if(!MyConnect(target_p) && (!IsOperGlobalKill(source_p)))
-       {
-               sendto_one_notice(source_p, ":Nick %s is not on your server "
-                                           "and you do not have the global_kill flag",
-                               target_p->name);
-               return 0;
-       }
-
        /* Last chance to stop the kill */
        moduledata.client = source_p;
        moduledata.target = target_p;
@@ -130,7 +122,7 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
        if (moduledata.approved == 0)
                /* The callee should have sent a message. */
-               return 0;
+               return;
 
        if(MyConnect(target_p))
                sendto_one(target_p, ":%s!%s@%s KILL %s :%s",
@@ -168,8 +160,6 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
 
        exit_client(client_p, target_p, source_p, buf);
-
-       return 0;
 }
 
 /*
@@ -177,7 +167,7 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
  *      parv[1] = kill victim
  *      parv[2] = kill path and reason
  */
-static int
+static void
 ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
@@ -225,7 +215,7 @@ ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                {
                        sendto_one_numeric(source_p, ERR_NOSUCHNICK,
                                           form_str(ERR_NOSUCHNICK), IsDigit(*user) ? "*" : user);
-                       return 0;
+                       return;
                }
                sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
        }
@@ -233,7 +223,7 @@ ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        if(IsServer(target_p) || IsMe(target_p))
        {
                sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
-               return 0;
+               return;
        }
 
        if(MyConnect(target_p))
@@ -287,8 +277,6 @@ ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        sprintf(buf, "Killed (%s %s)", source_p->name, reason);
 
        exit_client(client_p, target_p, source_p, buf);
-
-       return 0;
 }
 
 static void