X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_kill.c;h=b038bc884d496e770eec2c25badfadc3e967a2ea;hb=74de0986e40ba8bf85d71e4b574aa6a109a08c10;hp=1957fa157239e77c29ee1ccf952f428626203ff9;hpb=fc21303989a07d6091ef684150db29c49f682614;p=ircu2.10.12-pk.git diff --git a/ircd/m_kill.c b/ircd/m_kill.c index 1957fa1..b038bc8 100644 --- a/ircd/m_kill.c +++ b/ircd/m_kill.c @@ -119,7 +119,7 @@ static int do_kill(struct Client* cptr, struct Client* sptr, * have changed the target because of the nickname change. */ sendto_opmask_butone(0, IsServer(sptr) ? SNO_SERVKILL : SNO_OPERKILL, - "Received KILL message for %s. From %s Path: %s!%s %s", + "Received KILL message for %s from %s Path: %s!%s %s", get_client_name(victim, SHOW_IP), cli_name(sptr), inpath, path, msg); log_write_kill(victim, sptr, inpath, path, msg); @@ -151,12 +151,12 @@ static int do_kill(struct Client* cptr, struct Client* sptr, * always sees the kill as coming from me. */ if (MyConnect(victim)) - sendcmdto_one(feature_bool(FEAT_HIS_KILLWHO) ? &me : sptr, CMD_KILL, + sendcmdto_one(feature_bool(FEAT_HIS_KILLWHO) ? &his : sptr, CMD_KILL, victim, "%C :%s %s", victim, feature_bool(FEAT_HIS_KILLWHO) ? feature_str(FEAT_HIS_SERVERNAME) : cli_name(sptr), msg); return exit_client_msg(cptr, victim, feature_bool(FEAT_HIS_KILLWHO) ? &me : sptr, "Killed (%s %s)", - feature_bool(FEAT_HIS_KILLWHO) ? + feature_bool(FEAT_HIS_KILLWHO) ? feature_str(FEAT_HIS_SERVERNAME) : cli_name(sptr), msg); } @@ -258,7 +258,7 @@ int mo_kill(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) if (!(victim = FindClient(user))) { /* - * If the user has recently changed nick, we automaticly + * If the user has recently changed nick, we automatically * rewrite the KILL for this new nickname--this keeps * servers in synch when nick change and kill collide */ @@ -282,7 +282,7 @@ int mo_kill(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) if (!MyConnect(victim) && !HasPriv(sptr, PRIV_KILL)) { - sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Nick %s isnt on your server", + sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Nick %s isn't on your server", sptr, cli_name(victim)); return 0; }