diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-04-25 20:00:34 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-04-25 20:00:34 +0000 |
| commit | 999b8da572a3feeafefae44c00904a8b520dac0b (patch) | |
| tree | c861b2784944b26da72b4276ed01da52be20cba0 /sys/kern/exec_script.c | |
| parent | b05d5c9a49f53ca5b82fec6941a127b016cd0a9e (diff) | |
boom goes the dynamite
Diffstat (limited to 'sys/kern/exec_script.c')
| -rw-r--r-- | sys/kern/exec_script.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c index c44cbf53892..27faacfcc5f 100644 --- a/sys/kern/exec_script.c +++ b/sys/kern/exec_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_script.c,v 1.38 2016/03/19 12:04:15 natano Exp $ */ +/* $OpenBSD: exec_script.c,v 1.39 2016/04/25 20:00:33 tedu Exp $ */ /* $NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $ */ /* @@ -45,12 +45,6 @@ #include <sys/exec_script.h> -#include "systrace.h" - -#if NSYSTRACE > 0 -#include <dev/systrace.h> -#endif - /* * exec_script_makecmds(): Check if it's an executable shell script. @@ -205,21 +199,8 @@ check_shell: } *tmpsap = malloc(MAXPATHLEN, M_EXEC, M_WAITOK); if ((epp->ep_flags & EXEC_HASFD) == 0) { -#if NSYSTRACE > 0 - if (ISSET(p->p_flag, P_SYSTRACE)) { - error = systrace_scriptname(p, *tmpsap); - if (error != 0) - /* - * 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 -#endif - error = copyinstr(epp->ep_name, *tmpsap, MAXPATHLEN, - NULL); + error = copyinstr(epp->ep_name, *tmpsap, MAXPATHLEN, + NULL); if (error != 0) { *(tmpsap + 1) = NULL; goto fail; |