diff options
| author | Werner Koch <wk@gnupg.org> | 2017-02-01 17:54:14 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-02-01 17:54:14 +0100 |
| commit | 7440119e729d3fdedda8a9b44b70f8959beea8d7 (patch) | |
| tree | f4a255eee45c207be1673887aaffa91ae7db42b4 /dirmngr/ks-engine-http.c | |
| parent | Fix explanation of commit e175152ef7515921635bf1e00383e812668d13fc. (diff) | |
| download | gnupg2-7440119e729d3fdedda8a9b44b70f8959beea8d7.tar.xz gnupg2-7440119e729d3fdedda8a9b44b70f8959beea8d7.zip | |
dirmngr: New option --no-use-tor and internal changes.
* dirmngr/dns-stuff.c (disable_dns_tormode): New.
* dirmngr/dirmngr.c (oNoUseTor): New const.
(opts): New option --no-use-tor.
(tor_mode): New var.
(parse_rereadable_options): Change to use TOR_MODE.
(dirmngr_use_tor): New.
(set_tor_mode): Call disable_dns_tormode. Implement oNoUseTor.
* dirmngr/dirmngr.h (opt): Remove field 'use_tor'. Replace all
references by a call to dirmngr_use_tor().
* dirmngr/server.c (cmd_getinfo): Distinguish between default and
enforced TOR_MODE.
--
This patch replaces the global variable opt.use_tar by a function
testing a file local mode flag. This patch prepares for a
use-tor-if-available mode.
GnuPG-bug-id: 2935
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/ks-engine-http.c')
| -rw-r--r-- | dirmngr/ks-engine-http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/ks-engine-http.c b/dirmngr/ks-engine-http.c index dbbf4bb79..69642ff98 100644 --- a/dirmngr/ks-engine-http.c +++ b/dirmngr/ks-engine-http.c @@ -88,7 +88,7 @@ ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp) /* httphost */ NULL, /* fixme: AUTH */ NULL, ((opt.honor_http_proxy? HTTP_FLAG_TRY_PROXY:0) - | (opt.use_tor? HTTP_FLAG_FORCE_TOR:0) + | (dirmngr_use_tor ()? HTTP_FLAG_FORCE_TOR:0) | (opt.disable_ipv4? HTTP_FLAG_IGNORE_IPv4 : 0)), ctrl->http_proxy, session, |