---------------------
PatchSet 5847 
Date: 2007/09/26 03:54:04
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix compile errors after merge from HEAD.

Members: 
	src/ACLIP.cc:1.8.2.47->1.8.2.48 

Index: squid3/src/ACLIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLIP.cc,v
retrieving revision 1.8.2.47
retrieving revision 1.8.2.48
diff -u -r1.8.2.47 -r1.8.2.48
--- squid3/src/ACLIP.cc	26 Sep 2007 03:13:27 -0000	1.8.2.47
+++ squid3/src/ACLIP.cc	26 Sep 2007 03:54:04 -0000	1.8.2.48
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLIP.cc,v 1.8.2.47 2007/09/26 03:13:27 amosjeffries Exp $
+ * $Id: ACLIP.cc,v 1.8.2.48 2007/09/26 03:54:04 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -280,8 +280,8 @@
         iptype=AF_INET6;
 
 // Neither
-    } else if (sscanf(t, "%[^/]/%s", addr1, mask) == 2) {
-        addr2[0] = '\0';
+    } else if (sscanf(t, "%[^/]/%s", l_addr1, l_mask) == 2) {
+        l_addr2[0] = '\0';
     } else if (sscanf(t, "%s", l_addr1) == 1) {
         /*
          * Note, must use plain xgetaddrinfo() here because at startup
@@ -333,7 +333,7 @@
             debugs(28, 3, "aclIpParseIpData: Located host/IP: '" << r->addr1 << "'");
 
             r->addr2.SetAnyAddr();
-            DecodeMask(NULL, &r->mask);
+            DecodeMask(NULL, r->mask, AF_UNSPEC);
 
             Q = &r->next;
 
@@ -369,7 +369,7 @@
     else q->addr1 = l_addr1;
 
     /* Decode addr2 */
-    if (*addr2 && !(q->addr2=addr2) ) {
+    if (*l_addr2 && !(q->addr2=l_addr2) ) {
         debugs(28, 0, "aclIpParseIpData: unknown second address in '" << t << "'");
         delete q;
         self_destruct();
@@ -378,8 +378,8 @@
     else q->addr2 = l_addr2;
 
     /* Decode mask */
-    DecodeMask(NULL, &q->mask); // AYJ: is this just initialisation? if so we don't need it.
-    if (*l_mask && !DecodeMask(l_mask, &q->mask, iptype)) {
+    DecodeMask(NULL, q->mask, AF_UNSPEC); // AYJ: is this just initialisation? if so we don't need it.
+    if (*l_mask && !DecodeMask(l_mask, q->mask, iptype)) {
         debugs(28, 0, "aclParseIpData: unknown netmask '" << l_mask << "' in '" << t << "'");
         delete q;
         self_destruct();