---------------------
PatchSet 1310 
Date: 2005/04/25 09:08:03
Author: rmartinez
Branch: squid3-ipv6
Tag: (none) 
Log:
Solving minor merge conflicts. Rewriting variable naming conforming macros at config.h

Members: 
	src/ACLChecklist.cc:1.22.4.4->1.22.4.5 

Index: squid3/src/ACLChecklist.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLChecklist.cc,v
retrieving revision 1.22.4.4
retrieving revision 1.22.4.5
diff -u -r1.22.4.4 -r1.22.4.5
--- squid3/src/ACLChecklist.cc	19 Apr 2005 10:57:55 -0000	1.22.4.4
+++ squid3/src/ACLChecklist.cc	25 Apr 2005 09:08:03 -0000	1.22.4.5
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cc,v 1.22.4.4 2005/04/19 10:57:55 rmartinez Exp $
+ * $Id: ACLChecklist.cc,v 1.22.4.5 2005/04/25 09:08:03 rmartinez Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -62,11 +62,7 @@
 
     /* get authed here */
     /* Note: this fills in auth_user_request when applicable (auth incomplete)*/
-#if ENABLE_IPV6
-    switch (AuthUserRequest::tryToAuthenticateAndSetAuthUser (&auth_user_request, headertype, request, conn(), &src_addr6)) {
-#else
     switch (AuthUserRequest::tryToAuthenticateAndSetAuthUser (&auth_user_request, headertype, request, conn(), src_addr)) {
-#endif       
 
     case AUTH_ACL_CANNOT_AUTHENTICATE:
         debug(28, 4) ("aclMatchAcl: returning  0 user authenticated but not authorised.\n");
@@ -287,11 +283,7 @@
     cbdataFree(t);
 }
 
-ACLChecklist::ACLChecklist() : accessList (NULL),
-#if !ENABLE_IPV6
-        my_port (0),
-#endif        
-        request (NULL),
+ACLChecklist::ACLChecklist() : accessList (NULL), my_port (0), request (NULL),
         reply (NULL),
         auth_user_request (NULL)
 #if SQUID_SNMP
@@ -308,27 +300,12 @@
         destinationDomainChecked_(false),
         sourceDomainChecked_(false)
 {
-#if ENABLE_IPV6
-    memset (&src_addr6, '\0', sizeof (struct in_addr));
 
-<<<<<<< ACLChecklist.cc
-    memset (&dst_addr6, '\0', sizeof (struct in_addr));
-
-    memset (&my_sockaddr, '\0', sizeof (struct in_addr));
-#else
-    memset (&src_addr, '\0', sizeof (struct in_addr));
-=======
     memset (&src_addr, '\0', sizeof (struct IN_ADDR));
->>>>>>> 1.25
 
     memset (&dst_addr, '\0', sizeof (struct IN_ADDR));
 
-<<<<<<< ACLChecklist.cc
-    memset (&my_addr, '\0', sizeof (struct in_addr));
-#endif    
-=======
     memset (&my_addr, '\0', sizeof (struct IN_ADDR));
->>>>>>> 1.25
     rfc931[0] = '\0';
 }
 
@@ -527,14 +504,9 @@
 
     if (request != NULL) {
         checklist->request = requestLink(request);
-#if ENABLE_IPV6
-        sockaddr_storage_to_inaddr_storage(&request->client_sockaddr,&checklist->src_addr6);
-        checklist->my_sockaddr = request->my_sockaddr;
-#else
         checklist->src_addr = request->client_addr;
         checklist->my_addr = request->my_addr;
         checklist->my_port = request->my_port;
-#endif
     }
 
 #if USE_IDENT