From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 20 Jun 2011 11:24:11 +0000 (+1200)
Subject: Compile issues in revno.11508
X-Git-Tag: take08~55^2~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38dedeed4aabbf6a9f1030d995729adfa5d0674c;p=thirdparty%2Fsquid.git

Compile issues in revno.11508
---

diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc
index 799377668e..4ac0d7514d 100644
--- a/src/acl/Acl.cc
+++ b/src/acl/Acl.cc
@@ -32,10 +32,10 @@
  *
  */
 #include "config.h"
-
 #include "acl/Acl.h"
 #include "acl/Checklist.h"
 #include "ConfigParser.h"
+#include "Debug.h"
 #include "dlink.h"
 #include "ProtoPort.h"
 
@@ -113,7 +113,7 @@ ACL::ParseAclLine(ConfigParser &parser, ACL ** head)
 
     xstrncpy(aclname, t, ACL_NAME_SZ);
     /* snarf the ACL type */
-    char *theType;
+    const char *theType;
 
     if ((theType = strtok(NULL, w_space)) == NULL) {
         debugs(28, 0, "aclParseAclLine: missing ACL type.");
@@ -130,7 +130,7 @@ ACL::ParseAclLine(ConfigParser &parser, ACL ** head)
                 debugs(28, DBG_CRITICAL, "WARNING: 'myip' ACL is not reliable for interception proxies. Please use 'myportname' instead.");
             p = p->next;
         }
-        debugs(28, DBG_WARNING, "UPGRADE: ACL 'myip' type is has been renamed to 'localip' and matches the IP the client connected to.");
+        debugs(28, DBG_IMPORTANT, "UPGRADE: ACL 'myip' type is has been renamed to 'localip' and matches the IP the client connected to.");
         theType = "localip";
     } else if (strcmp(theType, "myport") != 0) {
         http_port_list *p = Config.Sockaddr.http;
@@ -142,7 +142,7 @@ ACL::ParseAclLine(ConfigParser &parser, ACL ** head)
             p = p->next;
         }
         theType = "localport";
-        debugs(28, DBG_WARNING, "UPGRADE: ACL 'myport' type is has been renamed to 'localport' and matches the port the client connected to.");
+        debugs(28, DBG_IMPORTANT, "UPGRADE: ACL 'myport' type is has been renamed to 'localport' and matches the port the client connected to.");
     }
 
     if (!Prototype::Registered(theType)) {