[illumos-gate merge]

commit fed692705a66b80d86971df5b579fcac7386f7df
    11459 mdb: disk_label should allow to set sector size (add ::sectorsize)
commit 06fcb0bcd6642c350546e3c87bbe20e27c20bff3
    11456 mdb: libmlsvc NULL pointer errors
commit 7b64dea37f86f82e3b7fc0f52918a46d5567ac8e
    11455 mdb: libfksmbfs NULL pointer errors
commit 1e88dc672aa1283fdca243a70822306e816340d7
    11452 zonestat: NULL pointer errors
commit eaf5a31c5f4fa067aaddcf5b08a0cd96c60bb9a4
    11451 zonecfg: NULL pointer errors
commit 4535e8bf8bd491fa8e4cdbe5019f9f59988c2b3e
    11450 zoneadm: NULL pointer errors
commit 35c005f243fafd7cad624b8a3a64298cab8ac172
    11449 zoneadmd: NULL pointer errors
commit a6959a060879676e965529db823ea71db60ac49b
    11448 xstr: NULL pointer errors
commit 1dfc79c00accaeca37225189e270abb0fab8619e
    11447 xargs: NULL pointer errors
commit 61aaa916808c601f9ee36d96c05ee9dac211d09e
    11446 whodo: NULL pointer errors
commit 352d7aeda1f43047aa9ff2e75cc69021c19a6a07
    11445 w: NULL pointer errors
commit c57b775050136774ef88b195e5833b3f9b86561b
    11435 svr4pkg: NULL pointer errors
commit 741b4d05bd52eb10a07f4f147bd8a211e5fe4351
    11502 installboot: find_multiboot() does crash with small files
commit 9b73ad49e885405d1de7968ac2e3d8c72087aa7d
    11444 vi: NULL pointer errors
commit df8910b3b3628a21874ee73195c149a955fce3a3
    11443 ttymon: NULL pointer errors
commit 0afbf5395cf4f4b8d9381a23f852c72b01ec43a4
    11441 th_tools: NULL pointer errors
commit 1580259811fb1670012fc9fad4be9624c2b60dae
    11440 tar: NULL pointer errors
commit b40273e57d35fb2f7610ad13fa58c32658c42ff3
    11439 tnf: NULL pointer errors
commit e8bca4ea3a0f5e2a084777440ee86870f8c9d88f
    11438 vgrind: NULL pointer errors
commit 974925512dfb8d6b72662ec04481adc913c6f914
    11437 uadmin: NULL pointer errors
commit 82aa8bddc8a3d3dd077c1cfa454aa5c0d5c23f04
    11436 tip: NULL pointer errors
commit 07b415c8e1ba7739721d764d37d8d12f9660af1b
    11433 stmfadm: NULL pointer errors
commit f9409f99581bedf7777548eccf1310c6995764a0
    11432 stat: NULL pointer errors
commit ce5e7d21f9e2e48a2f9b5a23ffec805e334d513e
    11397 mpathadm: NULL pointer errors
commit f9350d110371843c93efedac637b9d029faafee3
    11430 smbsrv: NULL pointer errors
commit 0ddec5a427aa889528aeed17fc3a8e7e26579f1d
    11454 smbclnt: NULL pointer errors
commit 06435337d318262e4e31a9efe4e40f5026d3e26b
commit e21c734b6349feebc8c570483066f720d79022b0
    11430 smbsrv: NULL pointer errors
commit f1ecae5bb6568ce2aae66095708ad60af2979a39
    11429 sulogin: NULL pointer errors
commit fad16a7e4518fa4e5453c3808b1145177946e030
    11428 sendmail: NULL pointer errors
commit e9f63cd6c655b536e94b801b642dc5ff37254568
    11427 stmfsvc: NULL pointer errors
commit 48fde5fb20cd190052b1df46a6d135fe26684fe9
    11426 stmfproxy: NULL pointer errors
commit 14916c4b3821f9ac20da481ae3d8f73f1f6a16d8
    11425 smserverd: NULL pointer errors
commit 09ece02e953c23ed645b4d9768b786c444f4b430
    11424 sbdadm: NULL pointer errors
commit b33ffbed882c3e46e1242f5768ff3dfa3a887e4c
    11423 sa: NULL pointer errors
commit 053601185d4f955b8a517694e8469c12a90c9c7b
    11420 rpcbind: NULL pointer errors
commit 9292c78d437d97bc5dd20bc4d6788a79e0661e02
    11419 rmformat: NULL pointer errors
commit 7bc3049f70ccb68ec7cd7ba1bb17a4643fb60f36
    11418 refer: NULL pointer errors
commit 46fbc806d6e97aff59942e61f3f01b8abc70b716
    11417 rcm_daemon: NULL pointer errors

1 files changed, 1 insertions, 1 deletions

diff --git a/usr/src/cmd/zonecfg/zonecfg.c b/usr/src/cmd/zonecfg/zonecfg.c
index 512f27d1e6..414e59abcd 100644
--- a/usr/src/cmd/zonecfg/zonecfg.c
+++ b/usr/src/cmd/zonecfg/zonecfg.c
@@ -6432,7 +6432,7 @@ brand_verify(zone_dochandle_t handle)
 	 * Dump the current config information for this zone to a file.
 	 */
 	strcpy(xml_file, "/tmp/zonecfg_verify.XXXXXX");
-	if (mkstemp(xml_file) == NULL)
+	if (mkstemp(xml_file) == -1)
 		return (Z_TEMP_FILE);
 	if ((err = zonecfg_verify_save(handle, xml_file)) != Z_OK) {
 		(void) unlink(xml_file);