From b0e8376e19072ec3c590273c69ab3e8e5edfdaca Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 31 Jan 2017 13:22:52 +0100 Subject: [PATCH] dirmngr: Require --allow-version-check even if --use-tor is used. * dirmngr/dirmngr.c (housekeeping_thread): Load swdb only if the option is set. Signed-off-by: Werner Koch --- dirmngr/dirmngr.c | 2 +- doc/dirmngr.texi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 15ba33b3d..7e640d4d6 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1798,7 +1798,7 @@ housekeeping_thread (void *arg) if (network_activity_seen) { network_activity_seen = 0; - if (opt.use_tor || opt.allow_version_check) + if (opt.allow_version_check) dirmngr_load_swdb (&ctrlbuf, 0); } diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi index fcc174f92..7fc11a2aa 100644 --- a/doc/dirmngr.texi +++ b/doc/dirmngr.texi @@ -266,8 +266,8 @@ seconds. @item --allow-version-check @opindex allow-version-check Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get -the list of current software versions. If this option is enabled, or -if @option{use-tor} is active, the list is retrieved when the local +the list of current software versions. If this option is enabled +the list is retrieved in case the local copy does not exist or is older than 5 to 7 days. See the option @option{--query-swdb} of the command @command{gpgconf} for more details. Note, that regardless of this option a version check can