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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-01-31 13:22:52 +01:00
parent e17fa5c75d
commit b0e8376e19
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 3 additions and 3 deletions

View File

@ -1798,7 +1798,7 @@ housekeeping_thread (void *arg)
if (network_activity_seen) if (network_activity_seen)
{ {
network_activity_seen = 0; network_activity_seen = 0;
if (opt.use_tor || opt.allow_version_check) if (opt.allow_version_check)
dirmngr_load_swdb (&ctrlbuf, 0); dirmngr_load_swdb (&ctrlbuf, 0);
} }

View File

@ -266,8 +266,8 @@ seconds.
@item --allow-version-check @item --allow-version-check
@opindex allow-version-check @opindex allow-version-check
Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
the list of current software versions. If this option is enabled, or the list of current software versions. If this option is enabled
if @option{use-tor} is active, the list is retrieved when the local the list is retrieved in case the local
copy does not exist or is older than 5 to 7 days. See the option 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 @option{--query-swdb} of the command @command{gpgconf} for more
details. Note, that regardless of this option a version check can details. Note, that regardless of this option a version check can