------------------------------------------------------------
revno: 11510
revision-id: squid3@treenet.co.nz-20110620112411-cf4omlem5r2ccgnz
parent: squid3@treenet.co.nz-20110620091351-c9s8a59xpr934358
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Mon 2011-06-20 23:24:11 +1200
message:
  Compile issues in revno.11508
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20110620112411-cf4omlem5r2ccgnz
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 3b74b46b9d0b3c11e2da7bd0ede1284164b31d51
# timestamp: 2011-06-20 11:52:39 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20110620091351-\
#   c9s8a59xpr934358
# 
# Begin patch
=== modified file 'src/acl/Acl.cc'
--- src/acl/Acl.cc	2011-06-20 08:51:32 +0000
+++ src/acl/Acl.cc	2011-06-20 11:24:11 +0000
@@ -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 @@
 
     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 @@
                 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 @@
             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)) {