From 3055ec4b761020d79f60a24556ca5d6545b581e5 Mon Sep 17 00:00:00 2001
From: Hakan Olsson <ho@cvs.openbsd.org>
Date: Tue, 11 Dec 2001 01:54:35 +0000
Subject: Don't hang waiting for select() with SIGTERM + no active SAs.

---
 sbin/isakmpd/isakmpd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sbin/isakmpd')

diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index c6ca0566c7d..add4ba90767 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isakmpd.c,v 1.38 2001/12/10 03:34:51 ho Exp $	*/
+/*	$OpenBSD: isakmpd.c,v 1.39 2001/12/11 01:54:34 ho Exp $	*/
 /*	$EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $	*/
 
 /*
@@ -297,7 +297,8 @@ daemon_shutdown (void)
 	}
       sigtermed++;
     }
-  else if (transport_prio_sendqs_empty ())
+
+  if (transport_prio_sendqs_empty ())
     {
       /*
        * When the prioritized transport sendq:s are empty, i.e all 
@@ -312,7 +313,7 @@ daemon_shutdown (void)
     }
 }
 
-/* called on SIGTERM */
+/* Called on SIGTERM, or by ui_shutdown_daemon().  */
 void
 daemon_shutdown_now (int sig)
 {
-- 
cgit v1.2.3