security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

dirmngr: Avoid testing for Tor with --gpgconf-list.

Browse Source 
* dirmngr/dirmngr.c (post_option_parsing): Do not call set_tor_mode.
(dirmngr_sighup_action): Call it here.
(main): Call it here unless in --gpgconf-list mode.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-03-11 18:15:05 +01:00
parent b7de105e0a
commit 9f37e93dd7
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dirmngr/dirmngr.c
View File

@ -763,7 +763,6 @@ post_option_parsing (void)
opt.connect_quick_timeout = opt.connect_timeout; opt.connect_quick_timeout = opt.connect_timeout;
set_debug (); set_debug ();
set_tor_mode ();
} }
@ -1090,7 +1089,12 @@ main (int argc, char **argv)
log_printf ("\n"); log_printf ("\n");
} }
/* Note that we do not run set_tor_mode in --gpgconf-list mode
* because it will attempt to connect to the tor client and that can
* be time consuming. */
post_option_parsing (); post_option_parsing ();
if (cmd != aGPGConfTest && cmd != aGPGConfList)
set_tor_mode ();
/* Get LDAP server list from file. */ /* Get LDAP server list from file. */
#if USE_LDAP #if USE_LDAP
@ -1864,6 +1868,7 @@ dirmngr_sighup_action (void)
log_info (_("SIGHUP received - " log_info (_("SIGHUP received - "
"re-reading configuration and flushing caches\n")); "re-reading configuration and flushing caches\n"));
reread_configuration (); reread_configuration ();
set_tor_mode ();
cert_cache_deinit (0); cert_cache_deinit (0);
crl_cache_deinit (); crl_cache_deinit ();
cert_cache_init (hkp_cacert_filenames); cert_cache_init (hkp_cacert_filenames);