From: Daniel Kahn Gillmor Date: Mon, 21 Nov 2016 04:09:24 +0000 (-0500) Subject: dirmngr: Avoid automatically checking upstream swdb. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=9a592a571a86653d2115acb72bdc95b66f67abda;p=gnupg2.git dirmngr: Avoid automatically checking upstream swdb. * dirmngr/dirmngr.c (housekeeping_thread): Avoid automatically checking upstream's software database. In Debian, software updates should be handled by the distro mechanism, and additional upstream checks only confuse the user. Signed-off-by: Daniel Kahn Gillmor Gbp-Pq: Topic dirmngr-idling Gbp-Pq: Name 0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch --- diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 130f74b..58a424e 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1773,7 +1773,6 @@ static void * housekeeping_thread (void *arg) { static int sentinel; - struct server_control_s ctrlbuf; (void)arg; @@ -1786,18 +1785,6 @@ housekeeping_thread (void *arg) if (opt.verbose > 1) log_info ("starting housekeeping\n"); - memset (&ctrlbuf, 0, sizeof ctrlbuf); - dirmngr_init_default_ctrl (&ctrlbuf); - - if (network_activity_seen) - { - network_activity_seen = 0; - if (opt.use_tor || opt.allow_version_check) - dirmngr_load_swdb (&ctrlbuf, 0); - } - - dirmngr_deinit_default_ctrl (&ctrlbuf); - if (opt.verbose > 1) log_info ("ready with housekeeping\n"); sentinel--;