From b70dfde80c312da8182f487ef9b8e6ddd0e04ce1 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 27 Oct 2015 15:21:38 -0700 Subject: [PATCH] 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. --- src/acl/Acl.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc index 40b8858769..18fc4c0f15 100644 --- a/src/acl/Acl.cc +++ b/src/acl/Acl.cc @@ -227,6 +227,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)) { -- 2.47.2