* 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"
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
/* 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
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);
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);
/* 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);
struct Client *target_p, const char *inpath, const char *reason)
{
struct Client *client_p;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
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);
- DLINK_FOREACH(ptr, serv_list.head)
+ RB_DLINK_FOREACH(ptr, serv_list.head)
{
client_p = ptr->data;