aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.c
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <[email protected]>2016-11-01 00:33:02 +0000
committerWerner Koch <[email protected]>2016-11-18 07:30:33 +0000
commitb3a917201207898059c048dd101344765201b03c (patch)
tree6c214ba1d66264ca9ba139853220286e0c5e5f57 /dirmngr/dirmngr.c
parentg10: Fix creating a lock for ToFU. (diff)
downloadgnupg-b3a917201207898059c048dd101344765201b03c.tar.gz
gnupg-b3a917201207898059c048dd101344765201b03c.zip
dirmngr: More w32 system daemon cleanup
* dirmngr/dirmngr.c (handle_tick): Remove w32 tests for shutdown_pending; no longer needed. -- In d83ba4897bf217d1045c58d1b99e52bd31c58812, we removed the Windows-specific system daemon features, where shutdown_pending was set from w32_service_control(). shutdown_pending is now never assigned outside of handle_signal() or within an inotify test, neither of which are available on w32. As a result, this stanza in handle_tick() should be dead code, and can be removed to keep things simple. Signed-off-by: Daniel Kahn Gillmor <[email protected]> s/win32/w32/ to please RMS ;-) -wk
Diffstat (limited to '')
-rw-r--r--dirmngr/dirmngr.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index f5dce811f..2a6729e4d 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1842,20 +1842,6 @@ time_for_housekeeping_p (time_t curtime)
static void
handle_tick (void)
{
- /* Under Windows we don't use signals and need a way for the loop to
- check for the shutdown flag. */
-#ifdef HAVE_W32_SYSTEM
- if (shutdown_pending)
- log_info (_("SIGTERM received - shutting down ...\n"));
- if (shutdown_pending > 2)
- {
- log_info (_("shutdown forced\n"));
- log_info ("%s %s stopped\n", strusage(11), strusage(13) );
- cleanup ();
- dirmngr_exit (0);
- }
-#endif /*HAVE_W32_SYSTEM*/
-
if (time_for_housekeeping_p (gnupg_get_time ()))
{
npth_t thread;