Commit c243d45a authored by Steve Holme's avatar Steve Holme
Browse files

curl: Fixed usage of DNS options when not using c-ares resolver 

Commit 32352ed6 introduced various DNS options, however, these
would cause curl to exit with CURLE_NOT_BUILT_IN when c-ares wasn't
being used as the backend resolver even if the options weren't set
by the user.

Additionally corrected some minor coding style errors from the same
commit.
parent 8a6dba52

src/tool_operate.c

+9 −3
Original line number Diff line number Diff line
@@ -1239,10 +1239,16 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) 
          my_setopt(curl, CURLOPT_PROGRESSDATA, &progressbar);

        }



        /* new in libcurl 7.24.0: */

        if(config->dns_servers)

          my_setopt_str(curl, CURLOPT_DNS_SERVERS, config->dns_servers);



        /* new in libcurl 7.33.0: */

        if(config->dns_interface)

          my_setopt_str(curl, CURLOPT_DNS_INTERFACE, config->dns_interface);

        if(config->dns_ipv4_addr)

          my_setopt_str(curl, CURLOPT_DNS_LOCAL_IP4, config->dns_ipv4_addr);

        if(config->dns_ipv6_addr)

        my_setopt_str(curl, CURLOPT_DNS_LOCAL_IP6, config->dns_ipv6_addr);



        /* new in libcurl 7.6.2: */

src/tool_cfgable.h

+4 −4

File changed.

Contains only whitespace changes.

src/tool_getparam.c

+1 −1

File changed.

Contains only whitespace changes.