1 From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2 Date: Sun, 20 Nov 2016 23:09:24 -0500
3 Subject: dirmngr: Avoid automatically checking upstream swdb.
5 * dirmngr/dirmngr.c (housekeeping_thread): Avoid automatically
6 checking upstream's software database. In Debian, software updates
7 should be handled by the distro mechanism, and additional upstream
8 checks only confuse the user.
10 Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
12 dirmngr/dirmngr.c | 13 -------------
13 1 file changed, 13 deletions(-)
15 diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
16 index 130f74bc7..58a424e8c 100644
17 --- a/dirmngr/dirmngr.c
18 +++ b/dirmngr/dirmngr.c
19 @@ -1773,7 +1773,6 @@ static void *
20 housekeeping_thread (void *arg)
23 - struct server_control_s ctrlbuf;
27 @@ -1786,18 +1785,6 @@ housekeeping_thread (void *arg)
29 log_info ("starting housekeeping\n");
31 - memset (&ctrlbuf, 0, sizeof ctrlbuf);
32 - dirmngr_init_default_ctrl (&ctrlbuf);
34 - if (network_activity_seen)
36 - network_activity_seen = 0;
37 - if (opt.use_tor || opt.allow_version_check)
38 - dirmngr_load_swdb (&ctrlbuf, 0);
41 - dirmngr_deinit_default_ctrl (&ctrlbuf);
44 log_info ("ready with housekeeping\n");