From a3170cf578b073b2c4c4cfbcf2bbd8347832166e Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Tue, 23 Sep 2014 13:46:47 +0000 Subject: [PATCH] Fix regression introduced in r480, where /BKI on non-joined clients no longer ignored. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@499 13b04d17-f746-0410-82c6-800466cd88b0 --- source/banlist.c | 4 ++-- source/misc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/banlist.c b/source/banlist.c index ce548d3..c442b39 100644 --- a/source/banlist.c +++ b/source/banlist.c @@ -1073,7 +1073,7 @@ BUILT_IN_COMMAND(kickban) } } if (!count && !isme(spec)) - userhostbase(spec, userhost_ban, 1, "%s %s %s", chan->channel, spec, command ? (!strcmp(command, "FUCK") ? "FUCK": set_ignore ? "BKI":empty_string):empty_string); + userhostbase(spec, userhost_ban, 1, "%s %s", chan->channel, command ? (!strcmp(command, "FUCK") ? "FUCK": set_ignore ? "BKI":empty_string):empty_string); reset_display_target(); } @@ -1116,7 +1116,7 @@ BUILT_IN_COMMAND(ban) if (strchr(spec, '!') && strchr(spec, '@')) send_to_server("MODE %s +b %s", chan->channel, spec); else - userhostbase(spec, userhost_ban, 1, "%s %s", chan->channel, spec); + userhostbase(spec, userhost_ban, 1, "%s", chan->channel); } } diff --git a/source/misc.c b/source/misc.c index d776f11..5c79be7 100644 --- a/source/misc.c +++ b/source/misc.c @@ -1343,7 +1343,7 @@ char *new_str; send_to_server("KILL %s :%s", to, new_str); break; case KBOOT: - userhostbase(to, userhost_ban, 1, "%s %s %s", get_current_channel_by_refnum(0), to, empty_string); + userhostbase(to, userhost_ban, 1, "%s", get_current_channel_by_refnum(0)); case KICK: send_to_server("KICK %s %s :%s", get_current_channel_by_refnum(0), to, new_str); break;