From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 24 Nov 2009 02:36:29 +0000 (+1300)
Subject: Fix detection of obsolete 'all' patterns
X-Git-Tag: SQUID_3_2_0_1~532
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e28f3e9985a592ba6e2ca693050669700520d3be;p=thirdparty%2Fsquid.git

Fix detection of obsolete 'all' patterns

A little bit overly enthusiastic on the additions...
 * 0.0.0.0 is a /32 not /0
 * 0->N is 'all', not 0->0
---

diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc
index bc9bbba848..982293be44 100644
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -277,7 +277,7 @@ acl_ip_data::FactoryParse(const char *t)
     /* Detect some old broken strings equivalent to 'all'.
      * treat them nicely. But be loud until its fixed.  */
     if (strcasecmp(t, "0/0") == 0 || strcasecmp(t, "0.0.0.0/0") == 0 || strcasecmp(t, "0.0.0.0/0.0.0.0") == 0 ||
-            strcasecmp(t, "0.0.0.0") == 0 || strcasecmp(t, "0.0.0.0-0.0.0.0") == 0 || strcasecmp(t, "0.0.0.0-0.0.0.0/0") == 0) {
+            strcasecmp(t, "0.0.0.0-255.255.255.255") == 0 || strcasecmp(t, "0.0.0.0-0.0.0.0/0") == 0) {
 
         debugs(28,DBG_CRITICAL, "ERROR: '" << t << "' needs to be replaced by the term 'all'.");
         debugs(28,DBG_CRITICAL, "SECURITY NOTICE: Overriding config setting. Using 'all' instead.");