[svn] Port over ratbox 2.2 r23507, r23624, r23626 (jilles/anfl):

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

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index c116b90f3921f8ebab9891c8fbb888677c629818..5e55f5e87d9d25d26fb9f6f2d1ab0dedb2e15b4f 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_kill.c 3161 2007-01-25 07:23:01Z nenolod $
+ *  $Id: m_kill.c 3163 2007-01-25 07:36:23Z nenolod $
  */
 
 #include "stdinc.h"
@@ -55,7 +55,7 @@ struct Message kill_msgtab = {
 
 mapi_clist_av1 kill_clist[] = { &kill_msgtab, NULL };
 
-DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, NULL, NULL, "$Revision: 3163 $");
 
 /*
 ** mo_kill
@@ -125,7 +125,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        /* Do not change the format of this message.  There's no point in changing messages
         * that have been around for ever, for no reason.. */
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                            "Received KILL message for %s[%s@%s]. From %s Path: %s (%s)",
+                            "Received KILL message for %s!%s@%s. From %s Path: %s (%s)",
                             target_p->name, target_p->username, target_p->host, 
                             parv[0], me.name, reason);
 
@@ -245,7 +245,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        if(IsOper(source_p))    /* send it normally */
        {
                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",
+                                    "Received KILL message for %s!%s@%s. From %s Path: %s!%s!%s!%s %s",
                                     target_p->name, target_p->username, target_p->host, parv[0], 
                                     source_p->user->server, source_p->host, source_p->username,
                                     source_p->name, reason);
@@ -258,7 +258,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
        else
        {
                sendto_realops_snomask(SNO_SKILL, L_ALL,
-                                    "Received KILL message for %s[%s@%s]. From %s %s",
+                                    "Received KILL message for %s!%s@%s. From %s %s",
                                     target_p->name, target_p->username, target_p->host,
                                     parv[0], reason);