Browse code

milter: localnet maskz

git-svn: trunk@3820

aCaB authored on 2008/04/29 21:09:43
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Tue Apr 29 13:08:43 CEST 2008 (acab)
2
+------------------------------------
3
+  * clamav-milter: fix iana reserved localnet masks - bb#958
4
+
1 5
 Mon Apr 28 16:25:08 CEST 2008 (acab)
2 6
 ------------------------------------
3 7
   * libclamav/unzip.c: check for unprefixed bz2 - bb#995
... ...
@@ -233,10 +233,10 @@ static struct cidr_net {	/* don't make this const because of -I flag */
233 233
 	uint32_t	base;
234 234
 	uint32_t	mask;
235 235
 } localNets[] = {
236
-	/*{ PACKADDR(127,   0,   0,   0), MAKEMASK(24) },	/*   127.0.0.0/24 */
237
-	{ PACKADDR(192, 168,   0,   0), MAKEMASK(24) },	/* 192.168.0.0/24 - RFC3330 */
238
-	/*{ PACKADDR(192, 18,   0,   0), MAKEMASK(17) },	/* 192.18.0.0/17 - RFC2544 */
239
-	/*{ PACKADDR(192, 0,   2,   0), MAKEMASK(8) },	/* 192.0.2.0/8 - RFC3330 */
236
+	/*{ PACKADDR(127,   0,   0,   0), MAKEMASK(8) },	/*   127.0.0.0/8 */
237
+	{ PACKADDR(192, 168,   0,   0), MAKEMASK(16) },	/* 192.168.0.0/16 - RFC3330 */
238
+	/*{ PACKADDR(192, 18,   0,   0), MAKEMASK(15) },	/* 192.18.0.0/15 - RFC2544 */
239
+	/*{ PACKADDR(192, 0,   2,   0), MAKEMASK(24) },	/* 192.0.2.0/24 - RFC3330 */
240 240
 	{ PACKADDR( 10,   0,   0,   0), MAKEMASK(8) },	/*    10.0.0.0/8 */
241 241
 	{ PACKADDR(172,  16,   0,   0), MAKEMASK(12) },	/*  172.16.0.0/12 */
242 242
 	{ PACKADDR(169, 254,   0,   0), MAKEMASK(16) },	/* 169.254.0.0/16 */