diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-05-04 10:35:25 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-05-04 10:35:25 +0000 |
| commit | 7912ad33492a640fe7edd6140dde61edbabdcd01 (patch) | |
| tree | dbede3607e8f6197282bad131fbdcb815e7641dc /usr.sbin/snmpd/proc.c | |
| parent | 7afd8ac3e3767f867e08828b23ef8a2eb632a7a8 (diff) | |
With the recent change by deraadt@ to introduce kern.nosuidcoredump=3,
we don't need the horrible debug hack anymore that disabled privdrop
and chroot to get core dumps of privsep processes. No functional
change for the normal binary, only if it is compiled with the
non-default -DDEBUG option.
Diffstat (limited to 'usr.sbin/snmpd/proc.c')
| -rw-r--r-- | usr.sbin/snmpd/proc.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/usr.sbin/snmpd/proc.c b/usr.sbin/snmpd/proc.c index 93fdac6fd6f..640bdc2a3b5 100644 --- a/usr.sbin/snmpd/proc.c +++ b/usr.sbin/snmpd/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.6 2014/04/21 19:47:27 reyk Exp $ */ +/* $OpenBSD: proc.c,v 1.7 2014/05/04 10:34:35 reyk Exp $ */ /* * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -372,31 +372,19 @@ proc_run(struct privsep *ps, struct privsep_proc *p, else root = pw->pw_dir; -#ifndef DEBUG if (chroot(root) == -1) fatal("proc_run: chroot"); if (chdir("/") == -1) fatal("proc_run: chdir(\"/\")"); -#else -#warning disabling privilege revocation and chroot in DEBUG MODE - if (p->p_chroot != NULL) { - if (chroot(root) == -1) - fatal("proc_run: chroot"); - if (chdir("/") == -1) - fatal("proc_run: chdir(\"/\")"); - } -#endif privsep_process = p->p_id; setproctitle("%s", p->p_title); -#ifndef DEBUG if (setgroups(1, &pw->pw_gid) || setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) || setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid)) fatal("proc_run: cannot drop privileges"); -#endif /* Fork child handlers */ for (n = 1; n < ps->ps_instances[p->p_id]; n++) { |