summaryrefslogtreecommitdiff
path: root/sys/kern/exec_script.c
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2007-12-31 15:31:24 +0000
committerad <ad@NetBSD.org>2007-12-31 15:31:24 +0000
commit2ecdf58c2c9f227031628cbec276d336f29dbb4e (patch)
treeeb4cf06176c6df69528c0740d6107cfed83e3715 /sys/kern/exec_script.c
parent7f3f50946654b3decba8b7e003bb6b2351d5c011 (diff)
Remove systrace. Ok core@.
Diffstat (limited to 'sys/kern/exec_script.c')
-rw-r--r--sys/kern/exec_script.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index 07023061154..b961f549d9e 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_script.c,v 1.59 2007/12/14 16:48:24 pooka Exp $ */
+/* $NetBSD: exec_script.c,v 1.60 2007/12/31 15:32:10 ad 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.59 2007/12/14 16:48:24 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.60 2007/12/31 15:32:10 ad Exp $");
#if defined(SETUIDSCRIPTS) && !defined(FDSCRIPTS)
#define FDSCRIPTS /* Need this for safe set-id scripts. */
@@ -56,10 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.59 2007/12/14 16:48:24 pooka Exp $
#include <sys/exec_script.h>
#include <sys/exec_elf.h>
-#ifdef SYSTRACE
-#include <sys/systrace.h>
-#endif /* SYSTRACE */
-
/*
* exec_script_makecmds(): Check if it's an executable shell script.
*
@@ -229,26 +225,8 @@ check_shell:
if ((epp->ep_flags & EXEC_HASFD) == 0) {
#endif
/* normally can't fail, but check for it if diagnostic */
-#ifdef SYSTRACE
- error = 1;
- if (ISSET(l->l_proc->p_flag, PK_SYSTRACE)) {
- error = systrace_scriptname(p, *tmpsap);
- if (error == 0)
- tmpsap++;
- }
- if (error) {
- /*
- * Since systrace_scriptname() provides a
- * convenience, not a security issue, we are
- * safe to do this.
- */
- error = copystr(epp->ep_name, *tmpsap++, MAXPATHLEN,
- NULL);
- }
-#else
error = copyinstr(epp->ep_name, *tmpsap++, MAXPATHLEN,
(size_t *)0);
-#endif /* SYSTRACE */
#ifdef DIAGNOSTIC
if (error != 0)
panic("exec_script: copyinstr couldn't fail");