summaryrefslogtreecommitdiffstats
path: root/sys/kern/imgact_shell.c
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2014-10-02 21:19:13 +0000
committersbruno <sbruno@FreeBSD.org>2014-10-02 21:19:13 +0000
commit3e8c118a1409af8246672b3e0c6cffa3d06f4209 (patch)
treefae1ff48fc3e296ea5b96675db22b5684f4194ec /sys/kern/imgact_shell.c
parent28944a4ef0cb8062b8e9f2443c7fd3ded887391c (diff)
downloadFreeBSD-src-3e8c118a1409af8246672b3e0c6cffa3d06f4209.zip
FreeBSD-src-3e8c118a1409af8246672b3e0c6cffa3d06f4209.tar.gz
MFC r271141: Allow multiple image activators to run on the same
execution by changing imgp->interpreted to a bitmask instead of, functionally, a bool. Approved by: re (gjb)
Diffstat (limited to 'sys/kern/imgact_shell.c')
-rw-r--r--sys/kern/imgact_shell.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index d9884f5..aaf521c 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -115,10 +115,10 @@ exec_shell_imgact(imgp)
* Don't allow a shell script to be the shell for a shell
* script. :-)
*/
- if (imgp->interpreted)
+ if (imgp->interpreted & IMGACT_SHELL)
return (ENOEXEC);
- imgp->interpreted = 1;
+ imgp->interpreted |= IMGACT_SHELL;
/*
* At this point we have the first page of the file mapped.
OpenPOWER on IntegriCloud