Mercurial > illumos > git > illumos-joyent
changeset 25609:aa7c2a44d749
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>
| author | Dan McDonald <danmcd@joyent.com> |
|---|---|
| date | Sun, 03 Jan 2021 09:14:04 -0500 |
| parents | b41def81a972 |
| children | ce2b70e7aab0 |
| files | usr/src/uts/common/exec/java/java.c usr/src/uts/common/exec/shbin/shbin.c |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/exec/java/java.c Mon Dec 28 19:44:13 2020 -0600 +++ b/usr/src/uts/common/exec/java/java.c Sun Jan 03 09:14:04 2021 -0500 @@ -89,7 +89,7 @@ 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 @@ 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) { /*
--- a/usr/src/uts/common/exec/shbin/shbin.c Mon Dec 28 19:44:13 2020 -0600 +++ b/usr/src/uts/common/exec/shbin/shbin.c Sun Jan 03 09:14:04 2021 -0500 @@ -167,7 +167,7 @@ { _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 @@ args->fname = devfd; } + eba = EBA_NONE; error = gexec(&nvp, uap, args, &idata, ++level, execsz, exec_file, cred, - EBA_NONE); + &eba); if (!error) { /*