OS-406
OS-249

*** 18,27 ****
--- 18,28 ----
   *
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2011, Joyent Inc. All rights reserved.
   */
  
  /*
   * Data-Link Driver
   */
*** 699,709 ****
  
                          if (zoneid != GLOBAL_ZONEID) {
                                  err = EACCES;
                                  goto done;
                          }
!                         err = dls_devnet_setzid(dlh, dzp->diz_zid);
                  } else {
                          kprop->pr_perm_flags = MAC_PROP_PERM_RW;
                          (*(zoneid_t *)kprop->pr_val) = dls_devnet_getzid(dlh);
                  }
                  break;
--- 700,711 ----
  
                          if (zoneid != GLOBAL_ZONEID) {
                                  err = EACCES;
                                  goto done;
                          }
!                         err = dls_devnet_setzid(dlh, dzp->diz_zid,
!                             dzp->diz_transient);
                  } else {
                          kprop->pr_perm_flags = MAC_PROP_PERM_RW;
                          (*(zoneid_t *)kprop->pr_val) = dls_devnet_getzid(dlh);
                  }
                  break;
*** 863,873 ****
  
          if ((err = drv_ioc_checkprivs(class, cred)) != 0)
                  return (err);
  
          if ((err = dls_devnet_rename(dir->dir_linkid1, dir->dir_linkid2,
!             dir->dir_link)) != 0)
                  return (err);
  
          if (dir->dir_linkid2 == DATALINK_INVALID_LINKID)
                  return (0);
  
--- 865,875 ----
  
          if ((err = drv_ioc_checkprivs(class, cred)) != 0)
                  return (err);
  
          if ((err = dls_devnet_rename(dir->dir_linkid1, dir->dir_linkid2,
!             dir->dir_link, dir->dir_zoneinit)) != 0)
                  return (err);
  
          if (dir->dir_linkid2 == DATALINK_INVALID_LINKID)
                  return (0);