OS-406
OS-249

@@ -18,10 +18,11 @@
  *
  * 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,11 +700,12 @@
 
                         if (zoneid != GLOBAL_ZONEID) {
                                 err = EACCES;
                                 goto done;
                         }
-                        err = dls_devnet_setzid(dlh, dzp->diz_zid);
+                        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,11 +865,11 @@
 
         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)
+            dir->dir_link, dir->dir_zoneinit)) != 0)
                 return (err);
 
         if (dir->dir_linkid2 == DATALINK_INVALID_LINKID)
                 return (0);