diff options
| author | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-05-27 07:08:22 +0000 |
|---|---|---|
| committer | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-05-27 07:08:22 +0000 |
| commit | 02b5fddf7084c1ad560ff91fddf5ea8f83fee34b (patch) | |
| tree | 9d7bdb425b1eeea7b6a6c364d40f255dab2fc2b6 /sbin | |
| parent | 892f026c9a348b5cda44cc7fe5af7c0edd985875 (diff) | |
o only pass signals from monitor to slave when pid is valid
o remove some unused monitor command
with and ok hshoexer
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/monitor.c | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/monitor.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sbin/isakmpd/monitor.c b/sbin/isakmpd/monitor.c index 6bc3763cef9..b54e19561c3 100644 --- a/sbin/isakmpd/monitor.c +++ b/sbin/isakmpd/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.52 2005/05/27 06:33:11 moritz Exp $ */ +/* $OpenBSD: monitor.c,v 1.53 2005/05/27 07:08:21 moritz Exp $ */ /* * Copyright (c) 2003 Håkan Olsson. All rights reserved. @@ -491,7 +491,7 @@ sig_pass_to_chld(int sig) { int oerrno = errno; - if (m_state.pid != -1) + if (m_state.pid > 0) kill(m_state.pid, sig); errno = oerrno; } diff --git a/sbin/isakmpd/monitor.h b/sbin/isakmpd/monitor.h index eb65a9179d3..5f8835bd055 100644 --- a/sbin/isakmpd/monitor.h +++ b/sbin/isakmpd/monitor.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.h,v 1.13 2005/04/08 16:24:12 deraadt Exp $ */ +/* $OpenBSD: monitor.h,v 1.14 2005/05/27 07:08:21 moritz Exp $ */ /* * Copyright (c) 2003 Håkan Olsson. All rights reserved. @@ -41,7 +41,6 @@ enum monitor_reqtypes { MONITOR_UI_INIT, MONITOR_PFKEY_OPEN, MONITOR_GET_FD, - MONITOR_GET_SOCKET, MONITOR_SETSOCKOPT, MONITOR_BIND, MONITOR_MKFIFO, |