From e238d01db93ea7bc736aeb9ba6854039ee995ab2 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Sat, 10 Dec 2011 17:17:13 +0100 Subject: [PATCH] If use_forward is off, ignore forwarding bans rather than stripping the channel. We do not want to set $r:* if $r:*$* was requested. --- src/chmode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chmode.c b/src/chmode.c index 373be216..48d63349 100644 --- a/src/chmode.c +++ b/src/chmode.c @@ -879,8 +879,8 @@ chm_ban(struct Client *source_p, struct Channel *chptr, if(forward != NULL && MyClient(source_p)) { if(!ConfigChannel.use_forward) - forward = NULL; - else if(!check_forward(source_p, chptr, forward)) + return; + if(!check_forward(source_p, chptr, forward)) return; /* Forwards only make sense for bans. */ if(mode_type != CHFL_BAN)