diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-01-03 09:14:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 09:14:04 -0500 |
| commit | ad472cc25e94c756bee73f18d46a715cc641f880 (patch) | |
| tree | 696c4005478f9896d8644b982bd3afa23b8a806f | |
| parent | 585b1602a53a03f5a0ca8e68c7d9c9fd12951688 (diff) | |
| download | illumos-joyent-ad472cc25e94c756bee73f18d46a715cc641f880.tar.gz | |
OS-8258 OS-4119 forgot about java and shbin exec types (#349)
Actually authored by: Andy Fiddaman <omnios@citrus-it.co.uk>
Actually reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Jason King <jbk@joyent.com>
Reviewed by: Mike Zeller <mike.zeller@joyent.com>
Reviewed by: Brian Bennett <brian.bennett@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>
| -rw-r--r-- | usr/src/uts/common/exec/java/java.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/exec/shbin/shbin.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/uts/common/exec/java/java.c b/usr/src/uts/common/exec/java/java.c index a61a6f105f..055f05bfc8 100644 --- a/usr/src/uts/common/exec/java/java.c +++ b/usr/src/uts/common/exec/java/java.c @@ -89,7 +89,7 @@ javaexec(vnode_t *vp, struct execa *uap, struct uarg *args, caddr_t execfile, cred_t *cred, int *brand_action) { struct intpdata idata; - int error; + int error, eba; ssize_t resid; vnode_t *nvp; off_t xoff, xoff_end; @@ -160,8 +160,9 @@ javaexec(vnode_t *vp, struct execa *uap, struct uarg *args, args->pathname = resolvepn.pn_path; /* don't free resolvepn until we are done with args */ pn_free(&lookpn); - error = gexec(&nvp, uap, args, &idata, level + 1, execsz, execfile, - cred, EBA_NONE); + eba = EBA_NONE; + error = gexec(&nvp, uap, args, &idata, level + 1, execsz, + execfile, cred, &eba); if (!error) { /* diff --git a/usr/src/uts/common/exec/shbin/shbin.c b/usr/src/uts/common/exec/shbin/shbin.c index 7b653a4c98..b325e600f4 100644 --- a/usr/src/uts/common/exec/shbin/shbin.c +++ b/usr/src/uts/common/exec/shbin/shbin.c @@ -167,7 +167,7 @@ shbinexec( { _NOTE(ARGUNUSED(brand_action)) vnode_t *nvp; - int error = 0; + int error = 0, eba; struct intpdata idata; struct pathname intppn; struct pathname resolvepn; @@ -246,8 +246,9 @@ shbinexec( args->fname = devfd; } + eba = EBA_NONE; error = gexec(&nvp, uap, args, &idata, ++level, execsz, exec_file, cred, - EBA_NONE); + &eba); if (!error) { /* |