Print this page
OS-4119 lxbrand panic when running native perl inside lx zone
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
        
*** 20,29 ****
--- 20,30 ----
   */
  
  /*
   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  * Copyright 2015, Joyent, Inc.
   */
  
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/sysmacros.h>
*** 56,66 ****
          int level,
          long *execsz,
          int setid,
          caddr_t exec_file,
          struct cred *cred,
!         int brand_action);
  
  #define SHBIN_CNTL(x)   ((x)&037)
  #define SHBINMAGIC_LEN  4
  extern char shbinmagicstr[];
  
--- 57,67 ----
          int level,
          long *execsz,
          int setid,
          caddr_t exec_file,
          struct cred *cred,
!         int *brand_action);
  
  #define SHBIN_CNTL(x)   ((x)&037)
  #define SHBINMAGIC_LEN  4
  extern char shbinmagicstr[];
  
*** 160,170 ****
          int level,
          long *execsz,
          int setid,
          caddr_t exec_file,
          struct cred *cred,
!         int brand_action)
  {
          _NOTE(ARGUNUSED(brand_action))
          vnode_t *nvp;
          int error = 0;
          struct intpdata idata;
--- 161,171 ----
          int level,
          long *execsz,
          int setid,
          caddr_t exec_file,
          struct cred *cred,
!         int *brand_action)
  {
          _NOTE(ARGUNUSED(brand_action))
          vnode_t *nvp;
          int error = 0;
          struct intpdata idata;