From 0ff9025533ba2eebdb4a23ebbf9761f76aceddeb Mon Sep 17 00:00:00 2001
From: maxv <maxv@NetBSD.org>
Date: Fri, 21 Feb 2014 08:11:59 +0000
Subject: [PATCH] Revert rev1.38. The header already begins with
 EXEC_SCRIPT_MAGIC="#!". So it can't be ELFMAG="\177ELF" at the same time.

ok christos@
---
 sys/kern/exec_script.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index e829625c38a9..824209a76d9f 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -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, struct exec_package *epp)
 	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;