m_info: Correct description of general::client_exit like in example confs.

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

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index c26518783abb75b845d889736f8a4a2498f75957..99bbf5e7f30977726efe3384793b8d0db480cd2b 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -40,6 +40,7 @@
 #include "modules.h"
 #include "s_newconf.h"
 
+static int h_can_kill;
 static char buf[BUFSIZE];
 
 static int ms_kill(struct Client *, struct Client *, int, const char **);
@@ -54,11 +55,15 @@ struct Message kill_msgtab = {
 
 mapi_clist_av1 kill_clist[] = { &kill_msgtab, NULL };
 
-DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, NULL, NULL, "$Revision: 3408 $");
+mapi_hlist_av1 kill_hlist[] = {
+       { "can_kill", &h_can_kill },
+       { NULL, NULL},
+};
+
+DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, kill_hlist, NULL, "$Revision: 3408 $");
 
 /*
 ** mo_kill
-**      parv[0] = sender prefix
 **      parv[1] = kill victim
 **      parv[2] = kill path
 */
@@ -69,6 +74,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        const char *inpath = client_p->name;
        const char *user;
        const char *reason;
+       hook_data_client_approval moduledata;
 
        user = parv[1];
 
@@ -116,6 +122,16 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
                return 0;
        }
 
+       /* Last chance to stop the kill */
+       moduledata.client = source_p;
+       moduledata.target = target_p;
+       moduledata.approved = 1;
+       call_hook(h_can_kill, &moduledata);
+
+       if (moduledata.approved == 0)
+               /* The callee should have sent a message. */
+               return 0;
+
        if(MyConnect(target_p))
                sendto_one(target_p, ":%s!%s@%s KILL %s :%s",
                           source_p->name, source_p->username, source_p->host,
@@ -158,7 +174,6 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_kill
- *      parv[0] = sender prefix
  *      parv[1] = kill victim
  *      parv[2] = kill path and reason
  */
@@ -170,7 +185,6 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        const char *reason;
        char default_reason[] = "<No reason given>";
        const char *path;
-       int chasing = 0;
 
        *buf = '\0';
 
@@ -214,7 +228,6 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
                        return 0;
                }
                sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
-               chasing = 1;
        }
 
        if(IsServer(target_p) || IsMe(target_p))