#include <assert.h>
#include <string.h>
-#if defined(DEBUGMODE)
-#define SYSLOG_KILL
-#endif
-
/*
* ms_kill - server message handler template
*
"before I got him :(", sptr);
return 0;
}
-#if 0
- /*
- * XXX - strictly speaking, the next 2 checks shouldn't be needed
- * this function only handles kills from servers, and the check
- * is done before the message is propagated --Bleep
- */
- if (IsServer(victim) || IsMe(victim)) {
- return send_error_to_client(sptr, ERR_CANTKILLSERVER); /* XXX DEAD */
- return 0;
- }
- if (IsLocOp(sptr) && !MyConnect(victim)) {
- return send_error_to_client(sptr, ERR_NOPRIVILEGES); /* XXX DEAD */
- return 0;
- }
- /*
- * XXX - this is guaranteed by the parser not to happen
- */
- if (EmptyString(path))
- path = "*no-path*"; /* Bogus server sending??? */
-#endif
+
/*
* Notify all *local* opers about the KILL (this includes the one
* originating the kill, if from this server--the special numeric
* Note: "victim->name" is used instead of "user" because we may
* have changed the target because of the nickname change.
*/
- inpath = cptr->name;
+ inpath = cli_name(cptr);
sendto_opmask_butone(0, IsServer(sptr) ? SNO_SERVKILL : SNO_OPERKILL,
- "Received KILL message for %C. From %s Path: %C!%s",
- victim, parv[0], cptr, path);
+ "Received KILL message for %s. From %s Path: %C!%s",
+ get_client_name(victim,SHOW_IP), parv[0], cptr, path);
-#if defined(SYSLOG_KILL)
- ircd_log_kill(victim, sptr, cptr->name, path);
-#endif
+ log_write_kill(victim, sptr, cli_name(cptr), path);
/*
* And pass on the message to other servers. Note, that if KILL
* was changed, the message has to be sent to all links, also
* back.
*/
- sendcmdto_serv_butone(sptr, CMD_KILL, cptr, "%C :%s!%s", victim, cptr->name,
+ sendcmdto_serv_butone(sptr, CMD_KILL, cptr, "%C :%s!%s", victim, cli_name(cptr),
path);
/*
* We *can* have crossed a NICK with this numeric... --Run
*/
if (MyConnect(victim))
sendcmdto_one(&me, CMD_KILL, cptr, "%C :%s!%s (Ghost 5 Numeric Collided)",
- victim, cptr->name, path);
+ victim, cli_name(cptr), path);
/*
* Set FLAGS_KILLED. This prevents exit_one_client from sending
* the unnecessary QUIT for this. (This flag should never be
* set in any other place)
*/
- victim->flags |= FLAGS_KILLED;
+ cli_flags(victim) |= FLAGS_KILLED;
/*
* Tell the victim she/he has been zapped, but *only* if
* anyway (as this user don't exist there any more either)
*/
if (MyConnect(victim))
- sendcmdto_one(sptr, CMD_KILL, victim, "%C :%s!%s", victim, cptr->name,
+ sendcmdto_one(sptr, CMD_KILL, victim, "%C :%s!%s", victim, NumServ(cptr),
path);
/*
* the first space in path will be at the end of the
assert(cptr == sptr);
assert(IsAnOper(sptr));
-#if defined(OPER_KILL)
-
if (parc < 3 || EmptyString(parv[parc - 1]))
return need_more_params(sptr, "KILL");
return send_reply(sptr, ERR_NOSUCHNICK, user);
sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Changed KILL %s into %s", sptr,
- user, victim->name);
+ user, cli_name(victim));
}
- if (!MyConnect(victim) && IsLocOp(cptr))
+ if (!HasPriv(sptr, MyConnect(victim) ? PRIV_LOCAL_KILL : PRIV_KILL))
return send_reply(sptr, ERR_NOPRIVILEGES);
if (IsServer(victim) || IsMe(victim)) {
* if the user is +k, prevent a kill from local user
*/
if (IsChannelService(victim))
- return send_reply(sptr, ERR_ISCHANSERVICE, "KILL", victim->name);
+ return send_reply(sptr, ERR_ISCHANSERVICE, "KILL", cli_name(victim));
-#ifdef LOCAL_KILL_ONLY
- if (!MyConnect(victim)) {
- send_reply(&me, CMD_NOTICE, sptr, "%C :Nick %s isnt on your server", sptr,
- victim->name);
+ if (!MyConnect(victim) && !HasPriv(sptr, PRIV_KILL)) {
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Nick %s isnt on your server",
+ sptr, cli_name(victim));
return 0;
}
-#endif
+
/*
* The kill originates from this server, initialize path.
* (In which case the 'path' may contain user suplied
if (strlen(comment) > TOPICLEN)
comment[TOPICLEN] = '\0';
- inpath = sptr->user->host;
+ inpath = cli_user(sptr)->host;
sprintf_irc(buf,
- "%s%s (%s)", cptr->name, IsOper(sptr) ? "" : "(L)", comment);
+ "%s%s (%s)", cli_name(cptr), IsOper(sptr) ? "" : "(L)", comment);
path = buf;
/*
*/
sendto_opmask_butone(0, SNO_OPERKILL,
"Received KILL message for %s. From %s Path: %s!%s",
- victim->name, parv[0], inpath, path);
+ get_client_name(victim,SHOW_IP), parv[0], inpath, path);
-#if defined(SYSLOG_KILL)
- ircd_log_kill(victim, sptr, inpath, path);
-#endif
+ log_write_kill(victim, sptr, inpath, path);
/*
* And pass on the message to other servers. Note, that if KILL
* was changed, the message has to be sent to all links, also
* the unnecessary QUIT for this. (This flag should never be
* set in any other place)
*/
- victim->flags |= FLAGS_KILLED;
+ cli_flags(victim) |= FLAGS_KILLED;
- sprintf_irc(buf, "Killed by %s (%s)", sptr->name, comment);
+ sprintf_irc(buf, "Killed by %s (%s)", cli_name(sptr), comment);
}
else {
/*
* anyway (as this user don't exist there any more either)
*/
sendcmdto_one(sptr, CMD_KILL, victim, "%C :%s!%s", victim, inpath, path);
- sprintf_irc(buf, "Local kill by %s (%s)", sptr->name, comment);
+ sprintf_irc(buf, "Local kill by %s (%s)", cli_name(sptr), comment);
}
return exit_client(cptr, victim, sptr, buf);
-
-#else /* !defined(OPER_KILL) */
-
- return send_reply(sptr, ERR_NOPRIVILEGES);
-
-#endif /* !defined(OPER_KILL) */
}
#if 0
{ /* get more infos when your local
clients are killed -- _dl */
if (IsServer(sptr))
- ircd_log(L_TRACE,
+ ircd_log(L_TRACE, /* XXX DEAD */
"A local client %s!%s@%s KILLED from %s [%s] Path: %s!%s)",
acptr->name, acptr->user->username, acptr->user->host,
parv[0], sptr->name, inpath, path);
else
- ircd_log(L_TRACE,
+ ircd_log(L_TRACE, /* XXX DEAD */
"A local client %s!%s@%s KILLED by %s [%s!%s@%s] (%s!%s)",
acptr->name, acptr->user->username, acptr->user->host,
parv[0], sptr->name, sptr->user->username, sptr->user->host,
inpath, path);
}
else if (IsOper(sptr))
- ircd_log(L_TRACE, "KILL From %s For %s Path %s!%s",
+ ircd_log(L_TRACE, "KILL From %s For %s Path %s!%s", /* XXX DEAD */
parv[0], acptr->name, inpath, path);
#endif
/*
projects / ircu2.10.12-pk.git / blobdiff