Automated merge with ssh://hg.atheme.org//hg/charybdis

[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..eaffc5687d5a431ba5e98a9ec60752c1aaa8bb24 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 3408 2007-04-14 20:58:56Z jilles $
  */
 
 #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: 3408 $");
 
 /*
 ** mo_kill
@@ -125,13 +125,13 @@ 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)",
-                            target_p->name, target_p->username, target_p->host, 
+                            "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);
 
        ilog(L_KILL, "%c %s %s!%s@%s %s %s",
             MyConnect(target_p) ? 'L' : 'G', get_oper_name(source_p),
-            target_p->name, target_p->username, target_p->host, target_p->user->server, reason);
+            target_p->name, target_p->username, target_p->host, target_p->servptr->name, reason);
 
        /*
         ** And pass on the message to other servers. Note, that if KILL
@@ -245,26 +245,26 @@ 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",
-                                    target_p->name, target_p->username, target_p->host, parv[0], 
-                                    source_p->user->server, source_p->host, source_p->username,
+                                    "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], 
+                                    source_p->servptr->name, source_p->host, source_p->username,
                                     source_p->name, reason);
 
                ilog(L_KILL, "%c %s %s!%s@%s %s %s",
                     MyConnect(target_p) ? 'O' : 'R', get_oper_name(source_p),
                     target_p->name, target_p->username, target_p->host,
-                    target_p->user->server, reason);
+                    target_p->servptr->name, reason);
        }
        else
        {
                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->host,
+                                    "Received KILL message for %s!%s@%s. From %s %s",
+                                    target_p->name, target_p->username, target_p->orighost,
                                     parv[0], reason);
 
                ilog(L_KILL, "S %s %s!%s@%s %s %s",
                     source_p->name, target_p->name, target_p->username,
-                    target_p->host, target_p->user->server, reason);
+                    target_p->host, target_p->servptr->name, reason);
        }
 
        relay_kill(client_p, source_p, target_p, path, reason);