---------------------
PatchSet 4417 
Date: 2007/04/29 15:28:54
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix compile errors that snuck into IPv4 build in last Rollout.

Members: 
	lib/IPAddress.cc:1.1.2.33->1.1.2.34 
	src/ftp.cc:1.26.2.14->1.26.2.15 

Index: squid3/lib/IPAddress.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/Attic/IPAddress.cc,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- squid3/lib/IPAddress.cc	29 Apr 2007 14:18:23 -0000	1.1.2.33
+++ squid3/lib/IPAddress.cc	29 Apr 2007 15:28:54 -0000	1.1.2.34
@@ -1,6 +1,6 @@
 
 /*
- * $Id: IPAddress.cc,v 1.1.2.33 2007/04/29 14:18:23 amosjeffries Exp $
+ * $Id: IPAddress.cc,v 1.1.2.34 2007/04/29 15:28:54 amosjeffries Exp $
  *
  * DEBUG: section 14   IP Storage and Handling
  * AUTHOR: Amos Jeffries
@@ -793,7 +793,6 @@
 
     if(buf.sin_family == 0) {
         buf.sin_family = AF_INET;
-        m_SocketAddr.sin_family = AF_INET;
     }
 #endif
 }
Index: squid3/src/ftp.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ftp.cc,v
retrieving revision 1.26.2.14
retrieving revision 1.26.2.15
diff -u -r1.26.2.14 -r1.26.2.15
--- squid3/src/ftp.cc	29 Apr 2007 14:18:23 -0000	1.26.2.14
+++ squid3/src/ftp.cc	29 Apr 2007 15:28:54 -0000	1.26.2.15
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.26.2.14 2007/04/29 14:18:23 amosjeffries Exp $
+ * $Id: ftp.cc,v 1.26.2.15 2007/04/29 15:28:54 amosjeffries Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -2463,10 +2463,12 @@
         addr = s4addr;
     }
     else {
+#if USE_IPV6
         struct sockaddr_in6 s6addr;
         addr_len = sizeof(struct sockaddr_in6);
         x = getsockname(ftpState->ctrl.fd, (struct sockaddr *)&s6addr, &addr_len);
         addr = s6addr;
+#endif
         /* FIXME INET6 : FTP is still IPv4-only */ return -1;
     }