[illumos-gate merge]

commit 7957da45b8e66b8cd6e917ac6bd8965817d7ef06
    10144 BZ2_bzDecompressReset() gets NULL check wrong
commit a8b4e7c71a6c1ef07e77c48dbb92fcdc8624266d
    10424 uts: NULL pointer errors in DEBUG build
commit f1ccfd86d00d3a46fa8dc85b88860e10a3ad1019
    10423 bridge: cast between incompatible function types
commit fb05fcb92e04bd3719e79f64be4c3432c2f1a119
    10422 conskbd: cast between incompatible function types
commit 98bfe312451089fb99dd3ccde47363ce4d275459
    10420 consms: cast between incompatible function types
commit 336380cbc80cdb79336de7f2b9a5d418c0991618
    10383 myri10ge: NULL pointer errors
commit 0333c43738b2582094bb2644c0a1f4211751447b
    10364 vnode: cast between incompatible function types
commit af34582fe571c99d9f74acf7c271e26c744fef5b
    10416 zoneadmd leaves trailing comma on link address
commit ffe245b40fe1731e6f0ea5c097a74eb78bc839e2
    10415 Memory leak in ipadm_zone_get_network()
commit b9e319bfd413f32cc39ec7b8ccc527f35712da7f
    10419 ntxn: cast between incompatible function types
commit 4fa33403ece8f42c56cba2b672d10f6ab4dc32cd
    10418 chxge: cast between incompatible function types
commit 888d78e951c54427c93b8ef788383952b9c63687
    10410 kmdb: set terminal window size
commit 3ab29d2187aaeb14feecd145834ac2f151dc822c
    10378 agpgart: NULL pointer errors
commit 7e12ceb3ebc63aeb71e91b496032ca22ca55f660
    10376 uts: NULL pointer issues in genunix
commit 7e897d1fc847b22dc338da9a5a59dae0cd8765de
    10373 vm_anon: cast between incompatible function types
commit 735c423ad1b2b03125a2c8d3840540d6b17f7dbf
    10372 vmem: cast between incompatible function types
commit b6d49c8438f976a7c4a6c9390228076c8f132847
    10371 vfs: cast between incompatible function types
commit d0cb1fb92629bc0283c88d4719df7285c1612700
    9425 allow channel programs to be stopped via signals
commit 9d1587b49e4692b8d6652e6c0b113a53b1af5313
    10124 smatch fixes for cryptoadm

	Conflicts:
	usr/src/cmd/zoneadmd/vplat.c

1 files changed, 10 insertions, 7 deletions

diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c
index f466836b96..01332d43e8 100644
--- a/usr/src/cmd/zoneadmd/vplat.c
+++ b/usr/src/cmd/zoneadmd/vplat.c
@@ -23,6 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2018, Joyent Inc.
  * Copyright (c) 2015, 2016 by Delphix. All rights reserved.
+ * Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  */
 
 /*
@@ -142,6 +143,8 @@
 /* Number of times to retry unmounting if it fails */
 #define	UMOUNT_RETRIES	30
 
+#define	ALT_MOUNT(mount_cmd)	((mount_cmd) != Z_MNT_BOOT)
+
 /* a reasonable estimate for the number of lwps per process */
 #define	LWPS_PER_PROCESS	10
 
@@ -1381,13 +1384,13 @@ free_fs_data(struct zone_fstab *fsarray, uint_t nelem)
  * scratch zone. The Environment creation process is split up into two
  * functions(build_mounted_pre_var() and build_mounted_post_var()). It
  * is done this way because:
- * 	We need to have both /etc and /var in the root of the scratchzone.
- * 	We loopback mount zone's own /etc and /var into the root of the
- * 	scratch zone. Unlike /etc, /var can be a seperate filesystem. So we
- * 	need to delay the mount of /var till the zone's root gets populated.
+ *	We need to have both /etc and /var in the root of the scratchzone.
+ *	We loopback mount zone's own /etc and /var into the root of the
+ *	scratch zone. Unlike /etc, /var can be a seperate filesystem. So we
+ *	need to delay the mount of /var till the zone's root gets populated.
  *	So mounting of localdirs[](/etc and /var) have been moved to the
- * 	build_mounted_post_var() which gets called only after the zone
- * 	specific filesystems are mounted.
+ *	build_mounted_post_var() which gets called only after the zone
+ *	specific filesystems are mounted.
  *
  * Note that the scratch zone we set up for updating the zone (Z_MNT_UPDATE)
  * does not loopback mount the zone's own /etc and /var into the root of the
@@ -2728,7 +2731,7 @@ add_net_for_linkid(zlog_t *zlogp, zoneid_t zoneid, zone_addr_list_t *start)
 		goto done;
 
 	/* over-write last ',' with '\0' */
-	zaddr[strnlen(zaddr, zlen) + 1] = '\0';
+	zaddr[strnlen(zaddr, zlen) - 1] = '\0';
 
 	/*
 	 * First make sure L3 protection is not already set on the link.