Fix bug #1299105 (overzealous IPv4 G-line checking).

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1493 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index d9b00478165a237d7f7c6b684df616d4d8e3d550..a06a9df82e68e8e422469518b71b7da57e3000f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-22  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/gline.c (gline_checkmask): Add missing digit in mask length
+       check.
+
+2005-09-21  Michael Poole <mdpoole@troilus.org>
+
+       * doc/example.conf: Remove confused and outdated references to
+       Martians.
+
 2005-09-20  Michael Poole <mdpoole@troilus.org>
 
        * ircd/Makefile.in: Regenerate "make depend" dependencies.

diff --git a/doc/example.conf b/doc/example.conf
index ae68ae080fcdabdd816b0f5b13528231be7e53f7..507376c1fe0e78ca28f3e58cf79bfe7317c18f8b 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -92,9 +92,8 @@ Admin {
 #
 # 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>";

diff --git a/ircd/gline.c b/ircd/gline.c
index 3bfaa89c706bb7687cb10f1bbc50c1b480b94e09..e3dd7bc6d6edd729093a53ef8f8786b76f3267b0 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -285,7 +285,7 @@ gline_checkmask(char *mask)
         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;