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 ca59821a42679d6041ba095756024ebea18d6a60..eaffc5687d5a431ba5e98a9ec60752c1aaa8bb24 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -131,7 +131,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 
        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
@@ -247,13 +247,13 @@ 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], 
-                                    source_p->user->server, source_p->host, source_p->username,
+                                    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
        {
@@ -264,7 +264,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 
                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);