Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / core / m_kill.c

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 616095bd6d7f95ed67ac88acd80f57a113bf8d68..c78baf58854717e6354c302f484d4488c5cdaf82 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -29,13 +29,12 @@
 #include "hash.h"              /* for find_client() */
 #include "ircd.h"
 #include "numeric.h"
-#include "sprintf_irc.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -59,7 +58,6 @@ DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, NULL, NULL, "$Revision: 3408 $"
 
 /*
 ** mo_kill
-**      parv[0] = sender prefix
 **      parv[1] = kill victim
 **      parv[2] = kill path
 */
@@ -127,7 +125,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                             "Received KILL message for %s!%s@%s. From %s Path: %s (%s)",
                             target_p->name, target_p->username, target_p->orighost, 
-                            parv[0], me.name, reason);
+                            source_p->name, me.name, reason);
 
        ilog(L_KILL, "%c %s %s!%s@%s %s %s",
             MyConnect(target_p) ? 'L' : 'G', get_oper_name(source_p),
@@ -150,7 +148,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
                target_p->flags |= FLAGS_KILLED;
        }
 
-       ircsprintf(buf, "Killed (%s (%s))", source_p->name, reason);
+       rb_sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
 
        exit_client(client_p, target_p, source_p, buf);
 
@@ -159,7 +157,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
  */
@@ -246,7 +243,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        {
                sendto_realops_snomask(IsService(source_p) ? SNO_SKILL : SNO_GENERAL, L_ALL,
                                     "Received KILL message for %s!%s@%s. From %s Path: %s!%s!%s!%s %s",
-                                    target_p->name, target_p->username, target_p->orighost, parv[0], 
+                                    target_p->name, target_p->username, target_p->orighost, source_p->name, 
                                     source_p->servptr->name, source_p->host, source_p->username,
                                     source_p->name, reason);
 
@@ -260,7 +257,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
                sendto_realops_snomask(SNO_SKILL, L_ALL,
                                     "Received KILL message for %s!%s@%s. From %s %s",
                                     target_p->name, target_p->username, target_p->orighost,
-                                    parv[0], reason);
+                                    source_p->name, reason);
 
                ilog(L_KILL, "S %s %s!%s@%s %s %s",
                     source_p->name, target_p->name, target_p->username,
@@ -272,7 +269,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        /* FLAGS_KILLED prevents a quit being sent out */
        target_p->flags |= FLAGS_KILLED;
 
-       ircsprintf(buf, "Killed (%s %s)", source_p->name, reason);
+       rb_sprintf(buf, "Killed (%s %s)", source_p->name, reason);
 
        exit_client(client_p, target_p, source_p, buf);
 
@@ -288,11 +285,11 @@ relay_kill(struct Client *one, struct Client *source_p,
        char buffer[BUFSIZE];
 
        if(MyClient(source_p))
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                            "%s!%s!%s!%s (%s)",
                            me.name, source_p->host, source_p->username, source_p->name, reason);
        else
-               ircsnprintf(buffer, sizeof(buffer), "%s %s", inpath, reason);
+               rb_snprintf(buffer, sizeof(buffer), "%s %s", inpath, reason);
 
        RB_DLINK_FOREACH(ptr, serv_list.head)
        {