---------------------
PatchSet 1316 
Date: 2005/04/25 13:46:53
Author: rmartinez
Branch: squid3-ipv6
Tag: (none) 
Log:
Solving update conflicts with HEAD version. Renaming inet_toa into INET_NTOA

Members: 
	src/auth/digest/auth_digest.cc:1.18.4.4->1.18.4.5 

Index: squid3/src/auth/digest/auth_digest.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/auth/digest/auth_digest.cc,v
retrieving revision 1.18.4.4
retrieving revision 1.18.4.5
diff -u -r1.18.4.4 -r1.18.4.5
--- squid3/src/auth/digest/auth_digest.cc	19 Apr 2005 10:58:21 -0000	1.18.4.4
+++ squid3/src/auth/digest/auth_digest.cc	25 Apr 2005 13:46:53 -0000	1.18.4.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_digest.cc,v 1.18.4.4 2005/04/19 10:58:21 rmartinez Exp $
+ * $Id: auth_digest.cc,v 1.18.4.5 2005/04/25 13:46:53 rmartinez Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Robert Collins
@@ -638,38 +638,19 @@
                 return;
             } else {
                 const char *useragent = httpHeaderGetStr(&request->header, HDR_USER_AGENT);
-<<<<<<< auth_digest.cc
-#if ENABLE_IPV6
-                static struct inaddr_storage last_broken_addr6;
-#else
-                static struct in_addr last_broken_addr;
-#endif                
-=======
 
                 static struct IN_ADDR last_broken_addr;
->>>>>>> 1.21
                 static int seen_broken_client = 0;
 
                 if (!seen_broken_client) {
-#if ENABLE_IPV6
-                    last_broken_addr6 = no_addr6;
-#else
                     last_broken_addr = no_addr;
-#endif                    
                     seen_broken_client = 1;
                 }
 
-#if ENABLE_IPV6
-                if (sockaddr_storage_to_inaddr_storage_simple_compare(&request->client_sockaddr,&last_broken_addr6) != 0) {
-                    debug(29, 1) ("\nDigest POST bug detected from %s using '%s'. Please upgrade browser. See Bug #630 for details.\n", sockaddr_host_address_to_address_string_force(&request->client_sockaddr), useragent ? useragent : "-");
-                    sockaddr_storage_to_inaddr_storage(&request->client_sockaddr,&last_broken_addr6);
-                }
-#else
                 if (memcmp(&last_broken_addr, &request->client_addr, sizeof(last_broken_addr)) != 0) {
-                    debug(29, 1) ("\nDigest POST bug detected from %s using '%s'. Please upgrade browser. See Bug #630 for details.\n", inet_ntoa(request->client_addr), useragent ? useragent : "-");
+                    debug(29, 1) ("\nDigest POST bug detected from %s using '%s'. Please upgrade browser. See Bug #630 for details.\n", INET_NTOA(request->client_addr), useragent ? useragent : "-");
                     last_broken_addr = request->client_addr;
                 }
-#endif                    
             }
         } else {
             credentials(Failed);