Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-09-22 20:42:31 UTC
Modified files:
ChangeLog doc/example.conf ircd/gline.c
Log message:
Fix bug #1299105 (overzealous IPv4 G-line checking).
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.703 ircu2.10/ChangeLog:1.704
--- ircu2.10/ChangeLog:1.703 Tue Sep 20 16:17:54 2005
+++ ircu2.10/ChangeLog Thu Sep 22 13:42:20 2005
@@ -1,3 +1,13 @@
+2005-09-22 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/gline.c (gline_checkmask): Add missing digit in mask length
+ check.
+
+2005-09-21 Michael Poole <[EMAIL PROTECTED]>
+
+ * doc/example.conf: Remove confused and outdated references to
+ Martians.
+
2005-09-20 Michael Poole <[EMAIL PROTECTED]>
* ircd/Makefile.in: Regenerate "make depend" dependencies.
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.60 ircu2.10/doc/example.conf:1.61
--- ircu2.10/doc/example.conf:1.60 Sat Jul 16 17:03:43 2005
+++ ircu2.10/doc/example.conf Thu Sep 22 13:42:21 2005
@@ -92,9 +92,8 @@
#
# All connections to the server are associated with a certain "connection
# class", be they incoming or outgoing (initiated by the server), be they
-# clients, servers or Martians. (Note that ircd doesn't have direct support
+# clients or servers.
# Recommended client classes:
-# for Martians (yet?); they will have to register as normal users. ;-)
# Take the following class blocks only as a guide.
# Class {
# name = "<class>";
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.60 ircu2.10/ircd/gline.c:1.61
--- ircu2.10/ircd/gline.c:1.60 Thu Sep 1 20:34:34 2005
+++ ircu2.10/ircd/gline.c Thu Sep 22 13:42:21 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.60 2005/09/02 03:34:34 entrope Exp $
+ * @version $Id: gline.c,v 1.61 2005/09/22 20:42:21 entrope Exp $
*/
#include "config.h"
@@ -285,7 +285,7 @@
if (ipmask < 128)
flags |= MASK_WILDS;
} else {
- if (dots != 3 || ipmask > 3)
+ if (dots != 3 || ipmask > 32)
return CHECK_REJECTED;
if (ipmask < 32)
flags |= MASK_WILDS;
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
