diff options
| author | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-04-03 20:22:20 +0000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-04-08 05:47:53 +0000 |
| commit | 94e5dec325733132e1590df46269456b035c716d (patch) | |
| tree | 45610846806b5d78f7c9a21c1d149b77f8da21b2 /usr/src/uts/common/exec/java/java.c | |
| parent | cc226f21065d923378447cc64811859f32458cce (diff) | |
| download | illumos-joyent-94e5dec325733132e1590df46269456b035c716d.tar.gz | |
OS-4119 lxbrand panic when running native perl inside lx zone
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/uts/common/exec/java/java.c')
| -rw-r--r-- | usr/src/uts/common/exec/java/java.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/exec/java/java.c b/usr/src/uts/common/exec/java/java.c index 7cf9126e8d..4ce223a682 100644 --- a/usr/src/uts/common/exec/java/java.c +++ b/usr/src/uts/common/exec/java/java.c @@ -21,6 +21,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2015, Joyent, Inc. */ /* @@ -85,7 +86,7 @@ char *jexec_arg = "-jar"; static int javaexec(vnode_t *vp, struct execa *uap, struct uarg *args, struct intpdata *idatap, int level, long *execsz, int setid, - caddr_t execfile, cred_t *cred, int brand_action) + caddr_t execfile, cred_t *cred, int *brand_action) { struct intpdata idata; int error; |