From e58d34ffcb8cfaa20f175b1395b5ee2dc596dcf5 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Thu, 22 Sep 2005 20:42:21 +0000 Subject: [PATCH 1/1] 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 --- ChangeLog | 10 ++++++++++ doc/example.conf | 3 +-- ircd/gline.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9b0047..a06a9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-09-22 Michael Poole + + * ircd/gline.c (gline_checkmask): Add missing digit in mask length + check. + +2005-09-21 Michael Poole + + * doc/example.conf: Remove confused and outdated references to + Martians. + 2005-09-20 Michael Poole * ircd/Makefile.in: Regenerate "make depend" dependencies. diff --git a/doc/example.conf b/doc/example.conf index ae68ae0..507376c 100644 --- 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 = ""; diff --git a/ircd/gline.c b/ircd/gline.c index 3bfaa89..e3dd7bc 100644 --- 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; -- 2.20.1