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/dirmngr.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/dirmngr.h')
| -rw-r--r-- | dirmngr/dirmngr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index ca07e788a..3724c007e 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -91,7 +91,6 @@ struct program. */ int running_detached; /* We are running in detached mode. */ - int use_tor; /* Tor mode has been enabled. */ int allow_version_check; /* --allow-version-check is active. */ int force; /* Force loading outdated CRLs. */ @@ -191,7 +190,7 @@ void dirmngr_init_default_ctrl (ctrl_t ctrl); void dirmngr_deinit_default_ctrl (ctrl_t ctrl); void dirmngr_sighup_action (void); const char* dirmngr_get_current_socket_name (void); - +int dirmngr_use_tor (void); /*-- Various housekeeping functions. --*/ void ks_hkp_housekeeping (time_t curtime); |