From c4568c811bc77a12e0270ee0a0d0fbebf766c18c Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 14 May 2013 19:07:45 +0000 Subject: - Improve KILL server notice to be more specific about the client being killed (ircnet style) git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2036 82007160-df01-0410-b94d-b575c5fd34c7 --- modules/core/m_kill.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c index 5fb5297..c96db23 100644 --- a/modules/core/m_kill.c +++ b/modules/core/m_kill.c @@ -145,8 +145,11 @@ mo_kill(struct Client *client_p, struct Client *source_p, * that have been around for ever, for no reason.. */ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, - "Received KILL message for %s. From %s Path: %s (%s)", - target_p->name, source_p->name, me.name, reason); + "Received KILL message for %s!%s@%s[%s/%s]. From %s Path: %s (%s)", + target_p->name, target_p->username, target_p->host, + target_p->servptr->name, + target_p->servptr->id[0] ? target_p->servptr->id : "<>", + source_p->name, me.name, reason); ilog(LOG_TYPE_KILL, "KILL From %s For %s Path %s (%s)", source_p->name, target_p->name, me.name, reason); @@ -272,13 +275,19 @@ ms_kill(struct Client *client_p, struct Client *source_p, */ if (HasUMode(source_p, UMODE_OPER)) /* send it normally */ sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, - "Received KILL message for %s. From %s Path: %s!%s!%s!%s %s", - target_p->name, source_p->name, source_p->servptr->name, - source_p->host, source_p->username, source_p->name, reason); + "Received KILL message for %s!%s@%s[%s/%s]. From %s Path: %s!%s!%s!%s %s", + target_p->name, target_p->username, target_p->host, + target_p->servptr->name, + target_p->servptr->id[0] ? target_p->servptr->id : "<>", source_p->name, + source_p->servptr->name, source_p->host, source_p->username, + source_p->name, reason); else sendto_realops_flags(UMODE_SKILL, L_ALL, SEND_NOTICE, - "Received KILL message for %s. From %s %s", - target_p->name, source_p->name, reason); + "Received KILL message for %s!%s@%s[%s/%s]. From %s %s", + target_p->name, target_p->username, target_p->host, + target_p->servptr->name, + target_p->servptr->id[0] ? target_p->servptr->id : "<>", + source_p->name, reason); ilog(LOG_TYPE_KILL, "KILL From %s For %s Path %s %s", source_p->name, target_p->name, source_p->name, reason); -- cgit