Commit 175fc509 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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.
parent 18f238dd

lib/ftp.c

+4 −2
Original line number Diff line number Diff line
@@ -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) {