From 175fc5096d019e1a1236dbf93a46a7bc64f163ba Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 30 Jun 2009 21:30:39 +0000 Subject: Tor Arntsen pointed out a missing #ifdef for IPv6, and I changed another one to use the "standard" ENABLE_IPV6 one. Also, if port number cannot be figured out to connect to after a name resolve (due to it not being IPv4 or IPv6), that particular address will now simply be skipped. --- lib/ftp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/ftp.c b/lib/ftp.c index 80841ee37..59fc1157a 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -1142,7 +1142,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, below */ Curl_printable_address(ai, myhost, sizeof(myhost)); -#ifdef PF_INET6 +#ifdef ENABLE_IPV6 if(!conn->bits.ftp_use_eprt && conn->bits.ipv6) /* EPRT is disabled but we are connected to a IPv6 host, so we ignore the request and enable EPRT again! */ @@ -1163,11 +1163,13 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, case AF_INET: port = ntohs(sa4->sin_port); break; +#ifdef ENABLE_IPV6 case AF_INET6: port = ntohs(sa6->sin6_port); break; +#endif default: - break; + continue; /* might as well skip this */ } if(EPRT == fcmd) { -- cgit v1.2.3