summaryrefslogtreecommitdiff
path: root/sys/kern/exec_script.c
diff options
context:
space:
mode:
authorelad <elad@NetBSD.org>2006-07-22 10:34:26 +0000
committerelad <elad@NetBSD.org>2006-07-22 10:34:26 +0000
commita92c1615a47e06009e9d893be6ddc45b18807944 (patch)
treee328df167a16d93e3763c7ebfcce6cf537685a22 /sys/kern/exec_script.c
parenta6e0095c3377f1925e64a4ecdf4d7ad3b6e2392f (diff)
deprecate the VERIFIED_EXEC option; now we only need the pseudo-device to
enable it. while here, some config file tweaks. tons of input from cube@ (thanks!) and okay blymn@.
Diffstat (limited to 'sys/kern/exec_script.c')
-rw-r--r--sys/kern/exec_script.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index abf5d0c3281..b680095a9ab 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_script.c,v 1.47 2006/05/14 21:15:11 elad Exp $ */
+/* $NetBSD: exec_script.c,v 1.48 2006/07/22 10:34:26 elad Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.47 2006/05/14 21:15:11 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.48 2006/07/22 10:34:26 elad Exp $");
#if defined(SETUIDSCRIPTS) && !defined(FDSCRIPTS)
#define FDSCRIPTS /* Need this for safe set-id scripts. */
@@ -56,9 +56,9 @@ __KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.47 2006/05/14 21:15:11 elad Exp $"
#include <sys/exec_script.h>
#include <sys/exec_elf.h>
-#ifdef VERIFIED_EXEC
+#if NVERIEXEC > 0
#include <sys/verified_exec.h>
-#endif /* VERIFIED_EXEC */
+#endif /* NVERIEXEC > 0 */
#ifdef SYSTRACE
#include <sys/systrace.h>
@@ -277,11 +277,11 @@ check_shell:
scriptvp = epp->ep_vp;
oldpnbuf = epp->ep_ndp->ni_cnd.cn_pnbuf;
-#ifdef VERIFIED_EXEC
+#if NVERIEXEC > 0
if ((error = check_exec(l, epp, VERIEXEC_INDIRECT)) == 0) {
#else
if ((error = check_exec(l, epp, 0)) == 0) {
-#endif
+#endif /* NVERIEXEC > 0 */
/* note that we've clobbered the header */
epp->ep_flags |= EXEC_DESTR|EXEC_HASES;