[illumos-gate merge]

commit 6a1a5bb98a625f9f7115565ac77e5c4170a030cc
    10133 smatch fixes for usr/src/cmd/fs.d
commit 86fec011b9215dec3869eac1fc39dc1aa9307340
    10414 loader: move libzfs to libstand and clean up Makefiles
commit eef4f27b270242808b43b4b23bd161df52839361
    8928 Want open source bnx
commit 57aea9348dbfeb813b16956eec292357525e2f66
    10429 loader: dereferencing type-punned pointer will break strict-aliasing rules
commit 54bc10fe6ad8a64fc279dc5fba56eaafea7ec2c0
    10421 bofi: cast between incompatible function types
commit 4bf63a956d4991cc5b0ead02fdea0b65bad10e78
    10428 loader: really fix cd9660 dirmatch
commit f18d8787c0ba765f61b003e2aae78db90b48f833
    7928 Add support for SMF_EXIT_NODAEMON

	Conflicts:
	usr/src/cmd/svc/startd/method.c
	usr/src/cmd/nscd/svc-nscd
	usr/src/cmd/dlmgmtd/svc-dlmgmtd
	exception_lists/cstyle

4 files changed, 23 insertions, 6 deletions

diff --git a/usr/src/cmd/fs.d/reparsed/reparsed.c b/usr/src/cmd/fs.d/reparsed/reparsed.c
index 17027b0c78..0b1532dc40 100644
--- a/usr/src/cmd/fs.d/reparsed/reparsed.c
+++ b/usr/src/cmd/fs.d/reparsed/reparsed.c
@@ -24,6 +24,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Reparsed daemon
  */
 
@@ -191,10 +195,11 @@ reparsed_door_call_error(int error, int buflen)
 	memset(&rpd_res, 0, sizeof (reparsed_door_res_t));
 	rpd_res.res_status = error;
 	rpd_res.res_len = buflen;
-	door_return((char *)&rpd_res, sizeof (reparsed_door_res_t), NULL, 0);
+	(void) door_return((char *)&rpd_res,
+	    sizeof (reparsed_door_res_t), NULL, 0);
 
 	(void) door_return(NULL, 0, NULL, 0);
-	/* NOTREACHED */
+	abort();
 }
 
 /*
diff --git a/usr/src/cmd/fs.d/smbclnt/chacl/chacl.c b/usr/src/cmd/fs.d/smbclnt/chacl/chacl.c
index 4b5f8722df..413c8a62fa 100644
--- a/usr/src/cmd/fs.d/smbclnt/chacl/chacl.c
+++ b/usr/src/cmd/fs.d/smbclnt/chacl/chacl.c
@@ -25,6 +25,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * This is the smbfs/chacl command.
  * (just for testing - not installed)
  *
@@ -138,9 +142,8 @@ main(int argc, char **argv)
 	/*
 	 * Which parts of the SD are being modified?
 	 */
-	selector = 0;
-	if (acl)
-		selector |= DACL_SECURITY_INFORMATION;
+	selector = DACL_SECURITY_INFORMATION;
+
 	if (uid != (uid_t)-1)
 		selector |= OWNER_SECURITY_INFORMATION;
 	if (gid != (gid_t)-1)
diff --git a/usr/src/cmd/fs.d/smbclnt/umount/umount.c b/usr/src/cmd/fs.d/smbclnt/umount/umount.c
index 5bf6984e78..412557e567 100644
--- a/usr/src/cmd/fs.d/smbclnt/umount/umount.c
+++ b/usr/src/cmd/fs.d/smbclnt/umount/umount.c
@@ -24,6 +24,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * smbfs umount
  */
 
@@ -179,6 +183,6 @@ mnttab_find(dirname)
 		}
 	}
 
-	fclose(fp);
+	(void) fclose(fp);
 	return (res);
 }
diff --git a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c
index 6b5439d47c..0098b56082 100644
--- a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c
+++ b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c
@@ -37,6 +37,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * The maximum supported file system size (in sectors) is the
  * number of frags that can be represented in an int32_t field
  * (INT_MAX) times the maximum number of sectors per frag.  Since
@@ -235,6 +239,7 @@
 #include	<sys/int_const.h>
 #include	<signal.h>
 #include	<sys/efi_partition.h>
+#include	<fslib.h>
 #include	"roll_log.h"
 
 #define	bcopy(f, t, n)    (void) memcpy(t, f, n)