From d792937686dac6a0a5217a589d8a2ba3ec083f51 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 22 Aug 2006 21:21:01 +0000
Subject: Peter Sylvester pointed out a flaw in the AllowServerConnect() in the
 FTP code when doing pure ipv6 EPRT connections.

---
 lib/ftp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/ftp.c b/lib/ftp.c
index 62c941e5d..bfa34bae8 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -215,8 +215,12 @@ static CURLcode AllowServerConnect(struct connectdata *conn)
     /* we have received data here */
     {
       curl_socket_t s = CURL_SOCKET_BAD;
-      socklen_t size = (socklen_t) sizeof(struct sockaddr_in);
+#ifdef ENABLE_IPV6
+      struct Curl_sockaddr_storage add;
+#else
       struct sockaddr_in add;
+#endif
+      socklen_t size = (socklen_t) sizeof(add);
 
       if(0 == getsockname(sock, (struct sockaddr *) &add, &size))
         s=accept(sock, (struct sockaddr *) &add, &size);
-- 
cgit v1.2.3