From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Oct 2015 05:36:51 +0000 (-0700)
Subject: Avoid errors when parsing manager ACL in old squid.conf
X-Git-Tag: SQUID_4_0_2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49549cd1d6a18459152a904e1a1c6198bc29a40c;p=thirdparty%2Fsquid.git

Avoid errors when parsing manager ACL in old squid.conf

ACL manager is now a built-in definition and has a different type. That
has been causing FATAL errors when parsing old squid.conf. We can be
nicer and just ignore the obsolete config lines.
---

diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc
index 81602c6682..f271189752 100644
--- a/src/acl/Acl.cc
+++ b/src/acl/Acl.cc
@@ -244,6 +244,10 @@ ACL::ParseAclLine(ConfigParser &parser, ACL ** head)
         }
         theType = "localport";
         debugs(28, DBG_IMPORTANT, "UPGRADE: ACL 'myport' type is has been renamed to 'localport' and matches the port the client connected to.");
+    } else if (strcmp(theType, "proto") == 0 && strcmp(aclname, "manager") == 0) {
+        // ACL manager is now a built-in and has a different type.
+        debugs(28, DBG_PARSE_NOTE(DBG_IMPORTANT), "UPGRADE: ACL 'manager' is now a built-in ACL. Remove it from your config file.");
+        return; // ignore the line
     }
 
     if (!Prototype::Registered(theType)) {