diff options
author | Werner Koch <[email protected]> | 2017-02-01 16:54:14 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2017-02-01 16:54:14 +0000 |
commit | 7440119e729d3fdedda8a9b44b70f8959beea8d7 (patch) | |
tree | f4a255eee45c207be1673887aaffa91ae7db42b4 /dirmngr/dns-stuff.h | |
parent | Fix explanation of commit e175152ef7515921635bf1e00383e812668d13fc. (diff) | |
download | gnupg-7440119e729d3fdedda8a9b44b70f8959beea8d7.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'dirmngr/dns-stuff.h')
-rw-r--r-- | dirmngr/dns-stuff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dirmngr/dns-stuff.h b/dirmngr/dns-stuff.h index 9eb97fd6a..9b8303c3b 100644 --- a/dirmngr/dns-stuff.h +++ b/dirmngr/dns-stuff.h @@ -120,6 +120,7 @@ int recursive_resolver_p (void); /* Put this module eternally into Tor mode. When called agained with * NEW_CIRCUIT request a new TOR circuit for the next DNS query. */ void enable_dns_tormode (int new_circuit); +void disable_dns_tormode (void); /* Change the default IP address of the nameserver to IPADDR. The address needs to be a numerical IP address and will be used for the |