diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2001-12-11 01:54:35 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2001-12-11 01:54:35 +0000 |
| commit | 3055ec4b761020d79f60a24556ca5d6545b581e5 (patch) | |
| tree | 60328bb0ea9c9edc9b4bac633b3b5845ae6d9754 /sbin | |
| parent | 3d5d37680b4c6902ab307f8fdbb341c844600dfd (diff) | |
Don't hang waiting for select() with SIGTERM + no active SAs.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/isakmpd.c | 7 |
1 files changed, 4 insertions, 3 deletions
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) { |