From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 16 Jan 2022 21:41:16 +0000 (+0100)
Subject: tool_getparam: DNS options that need c-ares now fail without it
X-Git-Tag: curl-7_82_0~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0041fe7ef5e32408865bc543897a42f5e2ea376e;p=thirdparty%2Fcurl.git

tool_getparam: DNS options that need c-ares now fail without it

Just silently accepting the options and then not having any effect is
not good.

Ref: #8283
Closes #8285
---

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 223214b0a6..14dca833cd 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -654,10 +654,14 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
     case '*': /* options without a short option */
       switch(subletter) {
       case '4': /* --dns-ipv4-addr */
+        if(!curlinfo->ares_num) /* c-ares is needed for this */
+          return PARAM_LIBCURL_DOESNT_SUPPORT;
         /* addr in dot notation */
         GetStr(&config->dns_ipv4_addr, nextarg);
         break;
       case '6': /* --dns-ipv6-addr */
+        if(!curlinfo->ares_num) /* c-ares is needed for this */
+          return PARAM_LIBCURL_DOESNT_SUPPORT;
         /* addr in dot notation */
         GetStr(&config->dns_ipv6_addr, nextarg);
         break;
@@ -685,6 +689,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
         GetStr(&config->cipher_list, nextarg);
         break;
       case 'D': /* --dns-interface */
+        if(!curlinfo->ares_num) /* c-ares is needed for this */
+          return PARAM_LIBCURL_DOESNT_SUPPORT;
         /* interface name */
         GetStr(&config->dns_interface, nextarg);
         break;
@@ -698,6 +704,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
         config->disable_epsv = (!toggle)?TRUE:FALSE;
         break;
       case 'F': /* --dns-servers */
+        if(!curlinfo->ares_num) /* c-ares is needed for this */
+          return PARAM_LIBCURL_DOESNT_SUPPORT;
         /* IP addrs of DNS servers */
         GetStr(&config->dns_servers, nextarg);
         break;