diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-24 14:43:38 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-24 14:43:38 +0000 |
| commit | a87928c4a80d4be9dfc4ac84c2f2ba0d5f469087 (patch) | |
| tree | 49554dd16df956336469607a46763fa2d1f8c423 | |
| parent | b461e8685124d262b79e88f8166b504fa3691f8e (diff) | |
Merge with EOM 1.28
Allow the application socket to not exist
| -rw-r--r-- | sbin/isakmpd/isakmpd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c index 1a8c57b4f33..a722aec25cd 100644 --- a/sbin/isakmpd/isakmpd.c +++ b/sbin/isakmpd/isakmpd.c @@ -1,5 +1,5 @@ -/* $OpenBSD: isakmpd.c,v 1.8 1999/02/26 03:44:42 niklas Exp $ */ -/* $EOM: isakmpd.c,v 1.27 1999/02/25 11:39:09 niklas Exp $ */ +/* $OpenBSD: isakmpd.c,v 1.9 1999/03/24 14:43:37 niklas Exp $ */ +/* $EOM: isakmpd.c,v 1.28 1999/03/24 11:01:06 niklas Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -242,7 +242,7 @@ main (int argc, char *argv[]) * XXX Some day we might want to deal with an abstract application * class instead, with many instantiations possible. */ - if (!app_none) + if (!app_none && app_socket >= 0) { FD_SET (app_socket, rfds); if (app_socket + 1 > n) @@ -279,7 +279,7 @@ main (int argc, char *argv[]) transport_send_messages (wfds); if (FD_ISSET (ui_socket, rfds)) ui_handler (); - if (!app_none && FD_ISSET (app_socket, rfds)) + if (!app_none && app_socket >= 0 && FD_ISSET (app_socket, rfds)) app_handler (); } timer_handle_expirations (); |