Module Name: src
Committed By: maxv
Date: Fri Feb 21 08:11:59 UTC 2014
Modified Files:
src/sys/kern: exec_script.c
Log Message:
Revert rev1.38. The header already begins with EXEC_SCRIPT_MAGIC="#!".
So it can't be ELFMAG="\177ELF" at the same time.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/kern/exec_script.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_script.c
diff -u src/sys/kern/exec_script.c:1.68 src/sys/kern/exec_script.c:1.69
--- src/sys/kern/exec_script.c:1.68 Mon Feb 17 19:29:46 2014
+++ src/sys/kern/exec_script.c Fri Feb 21 08:11:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_script.c,v 1.68 2014/02/17 19:29:46 maxv Exp $ */
+/* $NetBSD: exec_script.c,v 1.69 2014/02/21 08:11:59 maxv 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.68 2014/02/17 19:29:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.69 2014/02/21 08:11:59 maxv Exp $");
#if defined(SETUIDSCRIPTS) && !defined(FDSCRIPTS)
#define FDSCRIPTS /* Need this for safe set-id scripts. */
@@ -155,13 +155,6 @@ exec_script_makecmds(struct lwp *l, stru
if (cp >= hdrstr + hdrlinelen)
return ENOEXEC;
- /*
- * If the script has an ELF header, don't exec it.
- */
- if (epp->ep_hdrvalid >= sizeof(ELFMAG)-1 &&
- memcmp(hdrstr, ELFMAG, sizeof(ELFMAG)-1) == 0)
- return ENOEXEC;
-
shellname = NULL;
shellarg = NULL;
shellarglen = 0;
