summaryrefslogtreecommitdiffstats
path: root/dirmngr/ks-engine-finger.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2017-01-24 16:36:28 +0100
committerWerner Koch <wk@gnupg.org>2017-01-24 20:52:24 +0100
commit72736af86a501592d974d46ff754a63959e183bd (patch)
tree9bbd9f0c97af90bd800ac6d734dbb6d0dfa66e17 /dirmngr/ks-engine-finger.c
parenttools: Use platform abstraction for I/O. (diff)
downloadgnupg2-72736af86a501592d974d46ff754a63959e183bd.tar.xz
gnupg2-72736af86a501592d974d46ff754a63959e183bd.zip
dirmngr: New option --disable-ipv4.
* dirmngr/dirmngr.c (oDisableIPv4): New const. (opts): New option --disable-ipv4. (parse_rereadable_options): Set that option. * dirmngr/dirmngr.h (opt): New field 'disable_ipv4'. * dirmngr/dns-stuff.c (opt_disable_ipv4): bew var. (set_dns_disable_ipv4): New. (resolve_name_standard): Skip v4 addresses when OPT_DISABLE_IPV4 is set. * dirmngr/ks-engine-hkp.c (map_host): Ditto. (send_request): Pass HTTP_FLAG_IGNORE_IPv4 if opt.disable_v4 is set. * dirmngr/crlfetch.c (crl_fetch): Ditto. * dirmngr/ks-engine-finger.c (ks_finger_fetch): Ditto. * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto. * dirmngr/ocsp.c (do_ocsp_request): Ditto. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/ks-engine-finger.c')
-rw-r--r--dirmngr/ks-engine-finger.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/dirmngr/ks-engine-finger.c b/dirmngr/ks-engine-finger.c
index b1f02ad7d..114f2e9ac 100644
--- a/dirmngr/ks-engine-finger.c
+++ b/dirmngr/ks-engine-finger.c
@@ -83,7 +83,9 @@ ks_finger_fetch (ctrl_t ctrl, parsed_uri_t uri, estream_t *r_fp)
*server++ = 0;
err = http_raw_connect (&http, server, 79,
- (opt.use_tor? HTTP_FLAG_FORCE_TOR : 0), NULL);
+ ((opt.use_tor? HTTP_FLAG_FORCE_TOR : 0)
+ | (opt.disable_ipv4? HTTP_FLAG_IGNORE_IPv4 : 0)),
+ NULL);
if (err)
{
xfree (name);