diff options
| author | Werner Koch <[email protected]> | 2017-04-03 18:56:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-04-03 18:56:12 +0000 |
| commit | 3533b854408fa93734742b2ee12b62aa0d55ff28 (patch) | |
| tree | 80e6b337fac1b54d7d3759913ff5aa931e4cdbd6 /dirmngr/dirmngr.c | |
| parent | dirmngr,w32: Silence the 'certificate already cached' message. (diff) | |
| download | gnupg-3533b854408fa93734742b2ee12b62aa0d55ff28.tar.gz gnupg-3533b854408fa93734742b2ee12b62aa0d55ff28.zip | |
dirmngr: New option --disable-ipv6
* dirmngr/dirmngr.h (struct opt): Add field 'disable_ipv6'.
* dirmngr/dirmngr.c (oDisableIPv6): New const.
(opts): New option --disable-ipv6.
(parse_rereadable_options): Set that option.
* dirmngr/dns-stuff.c (opt_disable_ipv6): New var.
(set_dns_disable_ipv6): New.
(resolve_name_standard): Make use of it.
* dirmngr/ks-engine-finger.c (ks_finger_fetch): Take care of
OPT.DISABLE_IPV6.
* dirmngr/ks-engine-hkp.c (map_host): Ditto.
(send_request): Ditto.
* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
* dirmngr/ocsp.c (do_ocsp_request): Ditto.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/dirmngr.c')
| -rw-r--r-- | dirmngr/dirmngr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index e3e02fe6b..07b3b913f 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -113,6 +113,7 @@ enum cmd_and_opt_values { oDisableHTTP, oDisableLDAP, oDisableIPv4, + oDisableIPv6, oIgnoreLDAPDP, oIgnoreHTTPDP, oIgnoreOCSPSvcUrl, @@ -229,6 +230,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oNoUseTor, "no-use-tor", "@"), ARGPARSE_s_n (oDisableIPv4, "disable-ipv4", "@"), + ARGPARSE_s_n (oDisableIPv6, "disable-ipv6", "@"), ARGPARSE_s_s (oSocketName, "socket-name", "@"), /* Only for debugging. */ @@ -638,6 +640,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) case oDisableHTTP: opt.disable_http = 1; break; case oDisableLDAP: opt.disable_ldap = 1; break; case oDisableIPv4: opt.disable_ipv4 = 1; break; + case oDisableIPv6: opt.disable_ipv6 = 1; break; case oHonorHTTPProxy: opt.honor_http_proxy = 1; break; case oHTTPProxy: opt.http_proxy = pargs->r.ret_str; break; case oLDAPProxy: opt.ldap_proxy = pargs->r.ret_str; break; @@ -707,6 +710,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) set_dns_verbose (opt.verbose, !!DBG_DNS); http_set_verbose (opt.verbose, !!DBG_NETWORK); set_dns_disable_ipv4 (opt.disable_ipv4); + set_dns_disable_ipv6 (opt.disable_ipv6); return 1; /* Handled. */ } |