summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2010-02-08 00:26:51 +0000
committerguenther <guenther@openbsd.org>2010-02-08 00:26:51 +0000
commit43e089711547d808afcf3a8a1d24f05f08ee5499 (patch)
tree290892758ba336db5944bdfe20615abbe9d799a3
parentAdd an option to disable the smcup/rmcup alternate screen behaviour inside (diff)
downloadwireguard-openbsd-43e089711547d808afcf3a8a1d24f05f08ee5499.tar.xz
wireguard-openbsd-43e089711547d808afcf3a8a1d24f05f08ee5499.zip
Use SIGCHLD for the sigchild handler not SIGINT twice.
(This was inherited from ospfd; claudio fixed it there some time ago) Spotted in ripd by haesbaert <at> haesbaert.org
-rw-r--r--usr.sbin/dvmrpd/dvmrpd.c4
-rw-r--r--usr.sbin/ripd/ripd.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/dvmrpd/dvmrpd.c b/usr.sbin/dvmrpd/dvmrpd.c
index 99812975535..864a05f22cf 100644
--- a/usr.sbin/dvmrpd/dvmrpd.c
+++ b/usr.sbin/dvmrpd/dvmrpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dvmrpd.c,v 1.11 2009/11/02 20:31:50 claudio Exp $ */
+/* $OpenBSD: dvmrpd.c,v 1.12 2010/02/08 00:26:51 guenther Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -241,7 +241,7 @@ main(int argc, char *argv[])
/* setup signal handler */
signal_set(&ev_sigint, SIGINT, main_sig_handler, NULL);
signal_set(&ev_sigterm, SIGTERM, main_sig_handler, NULL);
- signal_set(&ev_sigchld, SIGINT, main_sig_handler, NULL);
+ signal_set(&ev_sigchld, SIGCHLD, main_sig_handler, NULL);
signal_set(&ev_sighup, SIGTERM, main_sig_handler, NULL);
signal_add(&ev_sigint, NULL);
signal_add(&ev_sigterm, NULL);
diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c
index b26b6827213..ed0438c8cea 100644
--- a/usr.sbin/ripd/ripd.c
+++ b/usr.sbin/ripd/ripd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ripd.c,v 1.19 2009/11/02 20:28:49 claudio Exp $ */
+/* $OpenBSD: ripd.c,v 1.20 2010/02/08 00:26:51 guenther Exp $ */
/*
* Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -232,7 +232,7 @@ main(int argc, char *argv[])
/* setup signal handler */
signal_set(&ev_sigint, SIGINT, main_sig_handler, NULL);
signal_set(&ev_sigterm, SIGTERM, main_sig_handler, NULL);
- signal_set(&ev_sigchld, SIGINT, main_sig_handler, NULL);
+ signal_set(&ev_sigchld, SIGCHLD, main_sig_handler, NULL);
signal_set(&ev_sighup, SIGHUP, main_sig_handler, NULL);
signal_add(&ev_sigint, NULL);
signal_add(&ev_sigterm, NULL);