1 files changed, 16 insertions, 12 deletions

diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c
index b4cc20951f..9e4dca604d 100644
--- a/usr/src/cmd/zoneadmd/vplat.c
+++ b/usr/src/cmd/zoneadmd/vplat.c
@@ -2471,6 +2471,7 @@ add_datalink(zlog_t *zlogp, char *zone_name, datalink_id_t linkid, char *dlname)
 {
 	dladm_status_t err;
 	boolean_t cpuset, poolset;
+	char *poolp;
 
 	/* First check if it's in use by global zone. */
 	if (zonecfg_ifname_exists(AF_INET, dlname) ||
@@ -2508,8 +2509,9 @@ add_datalink(zlog_t *zlogp, char *zone_name, datalink_id_t linkid, char *dlname)
 	}
 
 	if ((strlen(pool_name) != 0) && !cpuset && !poolset) {
+		poolp = pool_name;
 		err = dladm_set_linkprop(dld_handle, linkid, "pool",
-		    &pool_name, 1, DLADM_OPT_ACTIVE);
+		    &poolp, 1, DLADM_OPT_ACTIVE);
 		if (err != DLADM_STATUS_OK) {
 			zerror(zlogp, B_FALSE, "WARNING: unable to set "
 			    "pool %s to datalink %s", pool_name, dlname);
@@ -2552,7 +2554,7 @@ ipv4_prefixlen(struct sockaddr_in *sin)
 	m = SIN(&mask);
 	m->sin_family = AF_INET;
 	if (getnetmaskbyaddr(sin->sin_addr, &m->sin_addr) == 0) {
-		return (mask2plen(&mask));
+		return (mask2plen((struct sockaddr *)&mask));
 	} else if (IN_CLASSA(htonl(sin->sin_addr.s_addr))) {
 		return (8);
 	} else if (IN_CLASSB(ntohl(sin->sin_addr.s_addr))) {
@@ -3107,17 +3109,25 @@ remove_datalink_protect(zlog_t *zlogp, zoneid_t zoneid)
 	}
 
 	for (i = 0, dllink = dllinks; i < dlnum; i++, dllink++) {
+		char dlerr[DLADM_STRSIZE];
+
 		dlstatus = dladm_set_linkprop(dld_handle, *dllink,
 		    "protection", NULL, 0, DLADM_OPT_ACTIVE);
+		if (dlstatus == DLADM_STATUS_NOTFOUND) {
+			/* datalink does not belong to the GZ */
+			continue;
+		}
 		if (dlstatus != DLADM_STATUS_OK) {
-			zerror(zlogp, B_TRUE, "could not reset protection\n");
+			zerror(zlogp, B_FALSE,
+			    dladm_status2str(dlstatus, dlerr));
 			free(dllinks);
 			return (-1);
 		}
 		dlstatus = dladm_set_linkprop(dld_handle, *dllink,
 		    "allowed-ips", NULL, 0, DLADM_OPT_ACTIVE);
 		if (dlstatus != DLADM_STATUS_OK) {
-			zerror(zlogp, B_TRUE, "could not reset allowed-ips\n");
+			zerror(zlogp, B_FALSE,
+			    dladm_status2str(dlstatus, dlerr));
 			free(dllinks);
 			return (-1);
 		}
@@ -4508,6 +4518,8 @@ setup_zone_rm(zlog_t *zlogp, char *zone_name, zoneid_t zoneid)
 			zerror(zlogp, B_FALSE, "WARNING: %s",
 			    zonecfg_strerror(res));
 	}
+
+	/* Update saved pool name in case it has changed */
 	(void) zonecfg_get_poolname(handle, zone_name, pool_name, MAXPATHLEN);
 
 	zonecfg_fini_handle(handle);
@@ -4799,12 +4811,6 @@ vplat_create(zlog_t *zlogp, zone_mnt_t mount_cmd)
 		goto error;
 	}
 
-	if ((pool_name = malloc(MAXPATHLEN)) == NULL) {
-		zerror(zlogp, B_TRUE, "memory allocation failed");
-		return (Z_NOMEM);
-	}
-	bzero(pool_name, MAXPATHLEN);
-
 	/*
 	 * The following actions are not performed when merely mounting a zone
 	 * for administrative use.
@@ -5270,8 +5276,6 @@ vplat_teardown(zlog_t *zlogp, boolean_t unmount_cmd, boolean_t rebooting)
 		}
 	}
 
-	free(pool_name);
-
 	remove_mlps(zlogp, zoneid);
 
 	if (zone_destroy(zoneid) != 0) {