Committer : klmitch
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_07
Commit time: 2004-09-11 16:31:40 UTC
Modified files:
Tag: u2_10_11_07
ChangeLog ircd/channel.c
Log message:
Author: Bas Steendijk (by way of Kev <[EMAIL PROTECTED]>)
Log message:
if a ban is set which can be an IP mask, this ban is
only matched against user's IP when they join, not
their host. a ban [EMAIL PROTECTED] does not match someone
with a host like 1234.domain.tld but it should.
(Patch #888640)
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.130.2.18 ircu2.10/ChangeLog:1.290.2.130.2.19
--- ircu2.10/ChangeLog:1.290.2.130.2.18 Sat Sep 11 09:23:40 2004
+++ ircu2.10/ChangeLog Sat Sep 11 09:31:28 2004
@@ -1,3 +1,7 @@
+2004-09-11 Kevin L Mitchell <[EMAIL PROTECTED]>
+
+ * ircd/channel.c (is_banned): apply patch #888640
+
2003-06-08 Matthias Crauwels <[EMAIL PROTECTED]>
* include/ircd_features.h: new feature FEAT_HIS_LOCAL_CHAN_WHOIS
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.73.2.15.2.2 ircu2.10/ircd/channel.c:1.73.2.15.2.3
--- ircu2.10/ircd/channel.c:1.73.2.15.2.2 Sat Sep 11 08:26:48 2004
+++ ircu2.10/ircd/channel.c Sat Sep 11 09:31:29 2004
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: channel.c,v 1.73.2.15.2.2 2004/09/11 15:26:48 klmitch Exp $
+ * $Id: channel.c,v 1.73.2.15.2.3 2004/09/11 16:31:29 klmitch Exp $
*/
#include "config.h"
@@ -447,7 +447,7 @@
if (match(tmp->value.ban.banstr, ip_s) == 0)
break;
}
- else if (match(tmp->value.ban.banstr, s) == 0)
+ if (match(tmp->value.ban.banstr, s) == 0)
break;
else if (sr && match(tmp->value.ban.banstr, sr) == 0)
break;
----------------------- End of diff -----------------------
