summaryrefslogtreecommitdiffstats
path: root/sys/kern/init_main.c
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2011-04-18 21:44:55 +0000
committerguenther <guenther@openbsd.org>2011-04-18 21:44:55 +0000
commit80b87c503b3a5eaa2c4345d138a3da33607b5c6d (patch)
tree7e739a305397041b071ba9b077444161d3b477e3 /sys/kern/init_main.c
parentPerl security fix for CVE-2011-1487: (diff)
downloadwireguard-openbsd-80b87c503b3a5eaa2c4345d138a3da33607b5c6d.tar.xz
wireguard-openbsd-80b87c503b3a5eaa2c4345d138a3da33607b5c6d.zip
Revert the sigacts diff: NFS can apparently retain pointers to processes
until they're zombies and then send them signals (for intr mounts). Until that is untangled, the sigacts change is unsafe. sthen@ was the victim for this one
Diffstat (limited to 'sys/kern/init_main.c')
-rw-r--r--sys/kern/init_main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 5c5025ef1c3..43dc7f0cb67 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.176 2011/04/15 04:52:40 guenther Exp $ */
+/* $OpenBSD: init_main.c,v 1.177 2011/04/18 21:44:56 guenther Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -283,7 +283,7 @@ main(void *framep)
session0.s_count = 1;
session0.s_leader = pr;
- atomic_setbits_int(&p->p_flag, P_SYSTEM);
+ atomic_setbits_int(&p->p_flag, P_SYSTEM | P_NOCLDWAIT);
p->p_stat = SONPROC;
pr->ps_nice = NZERO;
p->p_emul = &emul_native;
@@ -615,9 +615,6 @@ start_init(void *arg)
check_console(p);
- /* process 0 ignores SIGCHLD, but we can't */
- p->p_sigacts->ps_flags = 0;
-
/*
* Need just enough stack to hold the faked-up "execve()" arguments.
*/