chiark / gitweb /
dirmngr: Avoid automatically checking upstream swdb.
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 21 Nov 2016 04:09:24 +0000 (23:09 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 3 Jan 2017 20:39:52 +0000 (20:39 +0000)
* 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 <dkg@fifthhorseman.net>
Gbp-Pq: Topic dirmngr-idling
Gbp-Pq: Name 0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch

dirmngr/dirmngr.c

index 130f74b..58a424e 100644 (file)
@@ -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--;