Mercurial > unleashed > wips

--- a/arch/x86/kernel/os/cms.c	Sun May 19 20:15:38 2019 -0400
+++ b/arch/x86/kernel/os/cms.c	Sun May 19 22:05:19 2019 -0400
@@ -28,6 +28,10 @@
  * All rights reserved.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/cpu_module_ms_impl.h>
 #include <sys/cpuvar.h>
@@ -225,7 +229,7 @@
 		    "version %d, kernel requires API version %d",
 		    modp->mod_modname, CMS_API_VERSION_TOPRINT(apiver),
 		    CMS_API_VERSION_TOPRINT(CMS_API_VERSION));
-	return (NULL);
+		return (NULL);
 	}

 	if ((ops = cms_getops(modp)) == NULL)
--- a/kernel/drivers/net/bnxe/577xx/hsi/hw/include/clc.h	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/drivers/net/bnxe/577xx/hsi/hw/include/clc.h	Sun May 19 22:05:19 2019 -0400
@@ -82,10 +82,6 @@
 #define ELINK_EVENT_ID_SFP_UNQUALIFIED_MODULE 	1
 #define ELINK_EVENT_ID_SFP_POWER_FAULT 		2

-#ifdef ELINK_AUX_POWER
-#define elink_cb_event_log(cb, level, ...)
-#define elink_cb_get_friendly_name(cb) ''
-#endif /*ELINK_AUX_POWER */
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 #endif
--- a/kernel/drivers/net/nge/nge_chip.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/drivers/net/nge/nge_chip.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include "nge.h"
 static uint32_t	nge_watchdog_count	= 1 << 5;
 static uint32_t	nge_watchdog_check	= 1 << 3;
@@ -1010,25 +1014,25 @@
 		mac = uaddr1.addr_bits.addr;
 		mac <<= 32;
 		mac |= nge_reg_get32(ngep, NGE_UNI_ADDR0);
-			ngep->chipinfo.hw_mac_addr = mac;
-			if (ngep->dev_spec_param.mac_addr_order) {
-				for (i = 0; i < ETHERADDRL; i++) {
-					ngep->chipinfo.vendor_addr.addr[i] =
-					    (uchar_t)mac;
-					ngep->cur_uni_addr.addr[i] =
-					    (uchar_t)mac;
-					mac >>= 8;
-				}
-			} else {
-				for (i = ETHERADDRL; i-- != 0; ) {
-					ngep->chipinfo.vendor_addr.addr[i] =
-					    (uchar_t)mac;
-					ngep->cur_uni_addr.addr[i] =
-					    (uchar_t)mac;
-					mac >>= 8;
-				}
+		ngep->chipinfo.hw_mac_addr = mac;
+		if (ngep->dev_spec_param.mac_addr_order) {
+			for (i = 0; i < ETHERADDRL; i++) {
+				ngep->chipinfo.vendor_addr.addr[i] =
+				    (uchar_t)mac;
+				ngep->cur_uni_addr.addr[i] =
+				    (uchar_t)mac;
+				mac >>= 8;
 			}
-			ngep->chipinfo.vendor_addr.set = 1;
+		} else {
+			for (i = ETHERADDRL; i-- != 0; ) {
+				ngep->chipinfo.vendor_addr.addr[i] =
+				    (uchar_t)mac;
+				ngep->cur_uni_addr.addr[i] =
+				    (uchar_t)mac;
+				mac >>= 8;
+			}
+		}
+		ngep->chipinfo.vendor_addr.set = 1;
 	}
 	pci_config_put8(ngep->cfg_handle, PCI_CONF_CACHE_LINESZ,
 	    ngep->chipinfo.clsize);
--- a/kernel/drivers/net/vr/vr.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/drivers/net/vr/vr.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/stream.h>
 #include <sys/strsun.h>
@@ -1700,7 +1704,7 @@
 					vrp->reset = 1;
 					vr_log(vrp, CE_WARN,
 					    "TX stalled, resetting MAC");
-				vrp->stats.txstalls++;
+					vrp->stats.txstalls++;
 				} else {
 					/*
 					 * Increase until we find that we've
@@ -3390,9 +3394,9 @@

 		default:
 			return;
-		}
-
-		mac_prop_info_set_default_uint8(prh, val);
+	}
+
+	mac_prop_info_set_default_uint8(prh, val);
 }

 /*
--- a/kernel/drivers/net/wifi/iwp/iwp.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/drivers/net/wifi/iwp/iwp.c	Sun May 19 22:05:19 2019 -0400
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 /*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -3832,21 +3836,21 @@
 	IEEE80211_ADDR_COPY(sc->sc_config.bssid, in->in_bssid);
 	sc->sc_config.chan = LE_16(ieee80211_chan2ieee(ic, in->in_chan));

-		sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0;
-		sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0;
-		sc->sc_config.ofdm_ht_single_stream_basic_rates = 0;
-
-		if (IEEE80211_MODE_11B == ic->ic_curmode) {
-			sc->sc_config.cck_basic_rates  = 0x03;
-			sc->sc_config.ofdm_basic_rates = 0;
-		} else if ((in->in_chan != IEEE80211_CHAN_ANYC) &&
-		    (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) {
-			sc->sc_config.cck_basic_rates  = 0;
-			sc->sc_config.ofdm_basic_rates = 0x15;
-		} else { /* assume 802.11b/g */
-			sc->sc_config.cck_basic_rates  = 0x0f;
-			sc->sc_config.ofdm_basic_rates = 0xff;
-		}
+	sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0;
+	sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0;
+	sc->sc_config.ofdm_ht_single_stream_basic_rates = 0;
+
+	if (IEEE80211_MODE_11B == ic->ic_curmode) {
+		sc->sc_config.cck_basic_rates  = 0x03;
+		sc->sc_config.ofdm_basic_rates = 0;
+	} else if ((in->in_chan != IEEE80211_CHAN_ANYC) &&
+	    (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) {
+		sc->sc_config.cck_basic_rates  = 0;
+		sc->sc_config.ofdm_basic_rates = 0x15;
+	} else { /* assume 802.11b/g */
+		sc->sc_config.cck_basic_rates  = 0x0f;
+		sc->sc_config.ofdm_basic_rates = 0xff;
+	}

 	sc->sc_config.flags &= ~LE_32(RXON_FLG_SHORT_PREAMBLE_MSK |
 	    RXON_FLG_SHORT_SLOT_MSK);
--- a/kernel/drivers/net/wifi/urtw/urtw.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/drivers/net/wifi/urtw/urtw.c	Sun May 19 22:05:19 2019 -0400
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 /*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -190,7 +194,7 @@
 		uint16_t tproduct = tbl[nentries].dev.p;
 		if (tbl[nentries].dev.v == vendor &&
 		    (tproduct == product || tproduct == USB_PRODUCT_ANY))
-		return (&tbl[nentries]);
+			return (&tbl[nentries]);
 	}
 	return (NULL);
 }
--- a/kernel/fs/nfs/nfs_dlinet.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/fs/nfs/nfs_dlinet.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -1142,7 +1146,7 @@
 						    "dhcp: couldn't add route "
 						    "to %s: %m.\n",
 						    inet_ntoa(defr));
-							continue;
+						continue;
 					}
 					if (dldebug) {
 						printf("dhcp: added route %s\n",
--- a/kernel/fs/portfs/port_fop.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/fs/portfs/port_fop.c	Sun May 19 22:05:19 2019 -0400
@@ -24,7 +24,7 @@
  */

 /*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*
@@ -1979,7 +1979,7 @@
 	 * the hash list.
 	 */
 	for (pvfsp = *ppvfsp; pvfsp->pvfs != vfsp; pvfsp = pvfsp->pvfs_next)
-	;
+		;

 	/*
 	 * For some of the filesystems, allow unmounts to proceed only if
@@ -2029,7 +2029,7 @@
 	mutex_enter(mtx);
 	for (; *ppvfsp && (*ppvfsp)->pvfs != vfsp;
 	    ppvfsp = &(*ppvfsp)->pvfs_next)
-	;
+		;

 	/*
 	 * remove and free it.
--- a/kernel/krtld/kobj.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/krtld/kobj.c	Sun May 19 22:05:19 2019 -0400
@@ -25,6 +25,7 @@
 /*
  * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>.
  * All rights reserved. Use is subject to license terms.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*
@@ -3295,26 +3296,26 @@
 	symid_t *ip;

 #ifdef KOBJ_DEBUG
-		if (kobj_debug & D_SYMBOLS) {
-			static struct module *lastmp = NULL;
-			Sym *sp;
-			if (lastmp != mp) {
-				_kobj_printf(ops,
-				    "krtld: symbol entry: file=%s\n",
-				    mp->filename);
-				_kobj_printf(ops,
-				    "krtld:\tsymndx\tvalue\t\t"
-				    "symbol name\n");
-				lastmp = mp;
-			}
-			sp = (Sym *)(mp->symtbl +
-			    index * mp->symhdr->sh_entsize);
-			_kobj_printf(ops, "krtld:\t[%3d]", index);
-			_kobj_printf(ops, "\t0x%lx", sp->st_value);
-			_kobj_printf(ops, "\t%s\n", name);
+	if (kobj_debug & D_SYMBOLS) {
+		static struct module *lastmp = NULL;
+		Sym *sp;
+		if (lastmp != mp) {
+			_kobj_printf(ops,
+			    "krtld: symbol entry: file=%s\n",
+			    mp->filename);
+			_kobj_printf(ops,
+			    "krtld:\tsymndx\tvalue\t\t"
+			    "symbol name\n");
+			lastmp = mp;
 		}
-
+		sp = (Sym *)(mp->symtbl +
+		    index * mp->symhdr->sh_entsize);
+		_kobj_printf(ops, "krtld:\t[%3d]", index);
+		_kobj_printf(ops, "\t0x%lx", sp->st_value);
+		_kobj_printf(ops, "\t%s\n", name);
+	}
 #endif
+
 	for (ip = &mp->buckets[kobj_hash_name(name) % mp->hashsize]; *ip;
 	    ip = &mp->chains[*ip]) {
 		;
--- a/kernel/net/ip/ip_mroute.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/net/ip/ip_mroute.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
 /* Copyright (c) 1990 Mentat Inc. */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Procedures for the kernel part of DVMRP,
  * a Distance-Vector Multicast Routing Protocol.
  * (See RFC-1075)
@@ -720,7 +724,7 @@
 					mutex_exit(&mfc_rt->mfc_mutex);
 					(void) untimeout(
 					    mfc_rt->mfc_timeout_id);
-						mfc_rt->mfc_timeout_id = 0;
+					mfc_rt->mfc_timeout_id = 0;
 					mutex_enter(&mfc_rt->mfc_mutex);

 					/*
--- a/kernel/net/ip/ip_ndp.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/net/ip/ip_ndp.c	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,10 @@
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/stream.h>
 #include <sys/stropts.h>
@@ -4954,7 +4958,7 @@
 			frac = 2;
 		/* Set intv randomly in the range [intv-frac .. intv+frac] */
 		if ((intv = intv - frac + rnd % (2 * frac + 1)) <= 0)
-		intv = 1;
+			intv = 1;
 	}
 	return (intv);
 }
--- a/kernel/os/aio.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/os/aio.c	Sun May 19 22:05:19 2019 -0400
@@ -25,6 +25,10 @@
  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Kernel asynchronous I/O.
  * This is only for raw devices now (as of Nov. 1993).
  */
@@ -303,7 +307,7 @@
 	offset_t	off;


-		rvp->r_vals = 0;
+	rvp->r_vals = 0;
 #if defined(_LITTLE_ENDIAN)
 	off = ((uoff_t)uap[5] << 32) | (uoff_t)uap[4];
 #else
--- a/kernel/os/modconf.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/os/modconf.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>
@@ -1336,7 +1340,7 @@
 	if (eswp->exec_func != NULL) {
 		printf("exec type %x is already installed\n",
 		    *eswp->exec_magic);
-			return (EBUSY);		 /* it's already there! */
+		return (EBUSY);		 /* it's already there! */
 	}

 	rw_enter(eswp->exec_lock, RW_WRITER);
--- a/kernel/os/streamio.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/os/streamio.c	Sun May 19 22:05:19 2019 -0400
@@ -2076,11 +2076,11 @@
 					 * messages after it has done a
 					 * qprocsoff.
 					 */
-				if (_OTHERQ(q)->q_next == NULL)
-					freemsg(bp);
-				else
-					qreply(q, bp);
-				return (0);
+					if (_OTHERQ(q)->q_next == NULL)
+						freemsg(bp);
+					else
+						qreply(q, bp);
+					return (0);
 				}
 		}
 		freemsg(bp);
--- a/kernel/vm/vm_seg.c	Sun May 19 20:15:38 2019 -0400
+++ b/kernel/vm/vm_seg.c	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,8 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright (c) 2015, Joyent, Inc.
  * Copyright 2015, Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -1832,7 +1832,7 @@
 		if (svd->type == MAP_SHARED &&
 		    svd->amp != NULL &&
 		    svd->amp->swresv > 0)
-		return (B_FALSE);
+			return (B_FALSE);
 	}
 	return (B_TRUE);
 }
--- a/usr/src/cmd/abi/appcert/static_prof/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/abi/appcert/static_prof/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -26,6 +26,7 @@
 #
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include		$(SRC)/cmd/Makefile.cmd

@@ -35,6 +36,9 @@
 CERRWARN +=	-Wno-unused-value
 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lelf

 CLEANFILES +=	$(PROG)
--- a/usr/src/cmd/abi/spectrans/Makefile.cmd	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/abi/spectrans/Makefile.cmd	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/cmd/Makefile.cmd

@@ -38,6 +37,9 @@
 CPPFLAGS +=	-I$(U_BASE) -I..
 LDFLAGS	+=	-L$(U_DIR)

+# not linted
+SMATCH=off
+
 LDLIBS	+=	-l$(U_LIB) -lgen

 SRCS	=	$(OBJECTS:%.o=../%.c)
--- a/usr/src/cmd/abi/spectrans/parser/Makefile.targ	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 .KEEP_STATE:

@@ -43,6 +44,9 @@
 CERRWARN	+= -Wno-unused-label
 CERRWARN	+= -Wno-uninitialized

+# not linted
+SMATCH=off
+
 objs/%.o: ../%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
--- a/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ	Sun May 19 22:05:19 2019 -0400
@@ -26,6 +26,7 @@
 #
 # Copyright 2015 Nexenta Systems, Inc.  All right reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 .KEEP_STATE:

@@ -49,3 +50,6 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-unused-label
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/acct/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/acct/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		acctcms acctcom acctcon acctcon1 acctcon2 \
 		acctdisk acctdusg acctmerg accton acctprc acctprc1 \
@@ -90,6 +91,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 .PARALLEL: $(ALL)
--- a/usr/src/cmd/acct/lib/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/acct/lib/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -19,14 +19,13 @@
 #
 # CDDL HEADER END
 #
-#
 # Copyright (c) 1989 by Sun Microsystems, Inc.
-#
+# Copyright (c) 2018, Joyent, Inc.
 #
 LIBS=	a.a

-OBJS=	pnpsplit.o  copyn.o devtolin.o expand.o lintodev.o \
-	namtouid.o tmless.o tmsecs.o uidtonam.o substr.o
+OBJS=	pnpsplit.o devtolin.o expand.o lintodev.o \
+	namtouid.o tmless.o tmsecs.o uidtonam.o substr.o
 SRCS=	$(OBJS:%.o=%.c)

 include	../../Makefile.cmd
@@ -36,6 +35,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-extra

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/acpi/acpidump/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/acpi/acpidump/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -27,6 +27,9 @@

 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(SRCTOP)/arch/x86/include/sys/acpi -DACPI_DUMP_APP

 LDLIBS += -ldevinfo
--- a/usr/src/cmd/acpi/acpixtract/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/acpi/acpixtract/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -26,6 +26,9 @@

 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(SRCTOP)/arch/x86/include/sys/acpi -DACPI_XTRACT_APP

 .KEEP_STATE:
--- a/usr/src/cmd/backup/Makefile.backup	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/backup/Makefile.backup	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 #
 # cmd/backup/Makefile.backup
 #
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/cmd/Makefile.cmd

@@ -40,6 +41,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-clobbered

+# not linted
+SMATCH=off
+
 UFSROOTETC=		$(ROOT)/etc
 UFSROOTUSR=		$(ROOT)/usr
 UFSROOTUSRLIB=		$(UFSROOTUSR)/lib
--- a/usr/src/cmd/bc/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/bc/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= bc
 EXOBJS= bc.o
@@ -36,6 +37,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-unused-label

+# nothing lintable
+SMATCH=off
+
 CFLAGS += -DXPG6
 ROOTLIBB= $(LIBB:%=$(ROOTLIB)/%)
 $(ROOTLIBB) :=	FILEMODE =	$(LIBFILEMODE)
--- a/usr/src/cmd/boot/bootadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/boot/bootadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,7 +24,8 @@
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2016 Nexenta Systems, Inc.
-#
+# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
+# Copyright (c) 2018, Joyent, Inc.

 PROG= bootadm

@@ -46,6 +47,8 @@
 CPPFLAGS +=	-I$(SRCTOP)/include -I$(SRC)/common -I$(SRC)/common/ficl
 CERRWARN +=	-Wall -Wno-unknown-pragmas

+SMOFF +=	all_func_returns
+
 CSTD=	$(CSTD_GNU99)

 all: $(PROG)
--- a/usr/src/cmd/boot/fiocompress/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/boot/fiocompress/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= fiocompress

@@ -38,6 +39,8 @@

 CFLAGS +=	-I../../../uts/common

+SMOFF += 	leaks
+
 all: $(PROG)

 $(PROG): $(OBJS)
--- a/usr/src/cmd/cdrw/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cdrw/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= cdrw

@@ -39,6 +40,9 @@
 CERRWARN +=	-Wno-parentheses
 CPPFLAGS += $(HAL_DBUS_CPPFLAGS)

+# not linted
+SMATCH=off
+
 $(ROOTBIN)/cdrw := FILEMODE = 04755

 .KEEP_STATE:
@@ -49,7 +53,7 @@
 	$(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)

-install: all $(ROOTPROG)
+install: all $(ROOTPROG)

 clean:
 	$(RM) $(OBJS)
--- a/usr/src/cmd/cfgadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cfgadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,11 +23,9 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/cfgadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.

-PROG= cfgadm
+PROG= cfgadm

 include ../Makefile.cmd

@@ -38,11 +36,13 @@
 XGETFLAGS += -a -x cfgadm.xcl
 CPPFLAGS += -I$(SRC)/common/util

-LDLIBS += -lcfgadm
+LDLIBS += -lcfgadm
+
+SMOFF += snprintf_overflow

 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- a/usr/src/cmd/cmd-crypto/pktool/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-crypto/pktool/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =	pktool

@@ -55,7 +56,10 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-unused-label

-LDLIBS +=  -lkmf -lpkcs11 -lcryptoutil
+# not linted, too much mess, but it should be
+SMATCH=off
+
+LDLIBS +=  -lkmf -lpkcs11 -lcryptoutil

 .KEEP_STATE:
--- a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# usr/src/cmd/cmd-inet/lib/nwamd/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 # Needed for ROOTFS_LIBDIR definition
 include		../../../../lib/Makefile.lib
@@ -60,6 +59,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 #
 # Instrument with CTF data to ease debugging.
 #
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG    = dhcpagent
@@ -43,6 +44,9 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 #
 # to compile a debug version, do a `make COPTFLAG="-g -XO0"'
 #
--- a/usr/src/cmd/cmd-inet/usr.bin/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=		finger rdate ruptime rwho whois
@@ -50,6 +51,8 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-function

+ruptime :=     SMOFF += leaks
+
 finger :=		LDLIBS += -lncurses

 .KEEP_STATE:
@@ -69,4 +72,4 @@

 clobber: $(SUBDIRS) clobber_local
 clobber_local: clean_local
-	$(RM) $(CLOBBERFILES)
+	$(RM) $(CLOBBERFILES)
--- a/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 #  Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		chat
 OBJS=		chat.o
@@ -14,6 +15,9 @@
 CERRWARN +=	-Wno-unused-value
 CERRWARN +=	-Wno-trigraphs

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -11,10 +11,9 @@

 #
 # Copyright 2017 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #

-# cmd/cmd-inet/usr.bin/dns-sd/Makefile
-
 PROG=		dns-sd

 include ../../../Makefile.cmd
@@ -29,6 +28,9 @@
 CPPFLAGS += -DMDNS_VERSIONSTR_NODTS
 LDLIBS += -ldns_sd

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		ftp
 DEFAULTFILES =	ftp.dfl
@@ -42,6 +43,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 LDLIBS +=	 -lgss

 # ftp defines its own delete and glob - localize all symbols to prevent a
--- a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,7 +24,7 @@
 #
 # Copyright (c) 1990 Mentat Inc.
 #
-# cmd/cmd-inet/usr.bin/netstat/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		netstat

@@ -50,9 +50,12 @@
 CERRWARN += -Wno-parentheses
 LDLIBS += -ldhcpagent -lkstat

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG) $(NPROG)
+all: $(PROG) $(NPROG)

 ROOTPROG=   $(PROG:%=$(ROOTBIN)/%)
--- a/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=		pppdump
@@ -16,6 +17,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:		$(PROG)
--- a/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	talk
 OBJS=	talk.o get_names.o display.o io.o ctl.o init_disp.o \
@@ -41,6 +42,9 @@
 CPPFLAGS +=	-DSYSV -DSTRNET -DBSD_COMP
 LDLIBS +=	-lncurses

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#

 PROG=		telnet
 OBJS=		telnet.o commands.o main.o network.o ring.o \
@@ -53,6 +55,9 @@
 LDLIBS +=	-lmech_krb5
 LDFLAGS +=	$(KRUNPATH) -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL)

+# "missing type for func"
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 ILBD=		ilbd
 PROG=		$(ILBD)
@@ -53,6 +54,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 CSTD =      $(CSTD_GNU99)

 # I18n
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/cmd-inet/usr.lib/in.ndpd/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		in.ndpd
 OBJS=		config.o main.o ndp.o tables.o trace.o
@@ -43,6 +42,9 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 CTFCONVERT_HOOK = && $(CTFCONVERT_O)
 CTFMERGE_HOOK = && $(CTFMERGE) -L VERSION -o $@ $(OBJS)
 $(OBJS) := CFLAGS += $(CTF_FLAGS)
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,10 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/cmd-inet/usr.lib/in.ripngd/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 MANIFEST=	ripng.xml

@@ -42,6 +39,9 @@

 $(OBJS) :=	CPPFLAGS +=	$(_D_UNIX98_EXTN)

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG	=	inetd
 MANIFEST=	inetd.xml inetd-upgrade.xml
@@ -42,6 +43,8 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-unused-label

+SMOFF += kmalloc_wrong_size
+
 LDLIBS    += -lrestart -lscf -lcontract -linetutil \
 		-lwrap -linetsvc -luutil -lumem
--- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		mdnsd
 MANIFEST=	multicast.xml
@@ -44,6 +45,13 @@

 include	../../../Makefile.cmd

+CERRWARN +=	-_gcc=-Wno-unused-variable
+CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
+CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORKDNS)
 $(ROOTMANIFEST)		:= FILEMODE= 444
--- a/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,10 +23,7 @@
 # Copyright 2000-2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/cmd-inet/usr.lib/pppoe/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 include		../../../Makefile.cmd

@@ -37,6 +34,9 @@
 CPPFLAGS +=	-I$(SRC)/uts/common
 CPPFLAGS +=	-I$(SRCTOP)/include

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:		$(PROG)
--- a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		wpad
 MANIFEST =	wpa.xml
@@ -37,6 +38,8 @@

 CPPFLAGS += -I$(SRCTOP)/include

+SMOFF += all_func_returns
+
 .KEEP_STATE:

 all:		$(PROG)
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright (c) 2018, Joyent, Inc.
 #

 SYNCPROG=	syncinit syncloop syncstat
@@ -81,6 +82,9 @@
 CERRWARN += -Wno-extra
 CERRWARN += -Wno-address

+# "missing type for func"
+SMATCH=off
+
 #
 # Message catalog
 #
--- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		ilbadm

@@ -39,6 +40,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 CSTD =	$(CSTD_GNU99)

 POFILES =	$(OBJS:%.o=%.po)
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#

 PROG=		in.rdisc
 MANIFEST=	rdisc.xml
@@ -33,6 +35,9 @@
 CPPFLAGS +=	-DSYSV -DBSD_COMP
 CERRWARN +=	-Wno-extra

+# "missing type for func"
+SMATCH =	off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -3,6 +3,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 ROUTEDPROG=	in.routed
 ROUTEDOBJS=	common.o if.o input.o main.o output.o parms.o radix.o \
@@ -32,6 +33,9 @@
 CPPFLAGS +=	$(_D_XOPEN_EXTN)
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized
+# not linted
+SMATCH=off
+
 LDLIBS +=	 -lmd
 CLEAN_FILES +=	$(ROUTEDOBJS) $(RTQUERYOBJS)
 CLOBBERFILES +=	$(ROUTEDPROG) $(RTQUERYPROG)
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,9 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#
-# cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		ipqosconf
 OBJS=		ipqosconf.o
@@ -55,6 +53,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS +=	 -lnvpair -lipp

 .KEEP_STATE:
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		ipsecalgs ipsecconf ipseckey
 SOCKETPROG=	ipsecalgs ipsecconf ipseckey
@@ -57,6 +58,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-switch

+# not linted
+SMATCH=off
+
 LDLIBS += -lipsecutil

 .KEEP_STATE:
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# cmd/cmd-inet/usr.sbin/nwamadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG= nwamadm

@@ -36,9 +35,12 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTUSRSBINPROG)

@@ -47,5 +49,4 @@

 clean:

-
 include ../../../Makefile.targ
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
 #
-# cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	nwamcfg
 OBJS=	nwamcfg.o nwamcfg_lex.o nwamcfg_grammar.tab.o
@@ -44,9 +44,11 @@
 CERRWARN +=	-Wno-unused-label
 CERRWARN +=	-Wno-implicit-function-declaration

+SMOFF += all_func_returns
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=	snoop
@@ -61,6 +62,9 @@
 CERRWARN += -Wno-unused-label
 CERRWARN += -Wno-unused-function

+# we really should have smatch running on this code but...
+SMATCH=off
+
 .KEEP_STATE:

 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		wificonfig
 OBJS=		wificonfig.o
@@ -37,6 +38,9 @@
 CERRWARN += -Wno-char-subscripts
 CERRWARN += -Wno-parentheses

+# needs work
+SMOFF += index_overflow,memcpy_overflow
+
 .KEEP_STATE:

 all:	$(PROG)
--- a/usr/src/cmd/cpc/cpustat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cpc/cpustat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		cpustat
 OBJS =		$(PROG).o caps.o time.o setgrp.o strtoset.o
@@ -40,6 +41,9 @@
 CPPFLAGS	+= -I$(SRC)/lib/libcpc/common -I$(STATCOMMONDIR)
 LDLIBS +=	-lcpc -lkstat

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:	$(PROG)
--- a/usr/src/cmd/cpc/cputrack/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cpc/cputrack/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 include	../../../Makefile.cmd

@@ -36,6 +35,8 @@
 CFLAGS64 +=	$(CTF_FLAGS)
 CPPFLAGS +=	-I$(SRC)/lib/libcpc/common

+# not linted
+SMATCH=off

 .KEEP_STATE:
--- a/usr/src/cmd/cpio/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cpio/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= cpio

@@ -32,12 +33,15 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS += -lsec -lcmdutils -lnvpair
 XGETFLAGS += -a -x cpio.xcl

 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- a/usr/src/cmd/cron/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cron/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 DEFAULTFILES =	cron.dfl

@@ -41,6 +42,9 @@

 CFLAGS += -DXPG4

+# not linted
+SMATCH=off
+
 ROOTVAR =	$(ROOT)/var

 ROOTSPCRON =	$(ROOTVAR)/spool/cron
--- a/usr/src/cmd/cxgbetool/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/cxgbetool/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -12,12 +12,16 @@
 #
 # Copyright (c) 2018 by Chelsio Communications, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 PROG =  cxgbetool

 include ../Makefile.cmd

 CFLAGS += $(CCVERBOSE) -I$(SRC)/uts/common/io/cxgbe/t4nex -I$(SRC)/uts/common/io/cxgbe/firmware

+SMOFF += all_func_returns
+
 all: $(PROG)

 install: all $(ROOTUSRSBINPROG)
--- a/usr/src/cmd/dc/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/dc/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= dc
 EXOBJS= dc.o
@@ -34,6 +35,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(MAPFILE.NGB) $(PROG)
--- a/usr/src/cmd/devfsadm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/devfsadm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 # This target builds both a command (daemon) and various shared objects.  This
 # isn't a typical target, and the inclusion of both library and command
@@ -92,6 +93,9 @@
 CERRWARN += -Wno-char-subscripts
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 # Define the dependencies required by devfsadm and all shared objects.
 LDLIBS +=		-ldevinfo
 devfsadm :=		LDLIBS += -lgen -lsysevent -lnvpair -lzonecfg
--- a/usr/src/cmd/devmgmt/cmds/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/devmgmt/cmds/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include ../../Makefile.cmd

@@ -37,6 +38,8 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+SMOFF += signed
+
 .KEEP_STATE:

 .PARALLEL: $(PROG)
--- a/usr/src/cmd/diskscan/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/diskscan/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,15 +20,18 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989, 2001 by Sun Microsystems, Inc.
 # All rights reserved.
+#
+# Copyright (c) 2018, Joyent, Inc.
+

 PROG= diskscan

 include ../Makefile.cmd

+SMOFF += leaks
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/dladm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/dladm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -18,11 +18,10 @@
 #
 # CDDL HEADER END
 #
-
-#
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		dladm
 ROOTFS_PROG=	$(PROG)
@@ -43,9 +42,12 @@
 LDLIBS +=	-ldladm -ldlpi -lkstat -lsecdb -lofmt -linetutil -ldevinfo
 LDLIBS +=	$(ZLAZYLOAD) -lrstp $(ZNOLAZYLOAD)

+SMOFF += snprintf_overflow
+
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-unused-label
 CERRWARN +=	-Wno-uninitialized
+
 $(ROOTCFGDIR)/secobj.conf := FILEMODE= 660

 .KEEP_STATE:
--- a/usr/src/cmd/dlstat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/dlstat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG= dlstat

@@ -35,6 +35,9 @@
 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 XGETFLAGS += -a -x $(PROG).xcl
 LDLIBS += -L$(ROOT)/lib
 LDLIBS += -ldladm -lofmt
--- a/usr/src/cmd/dtrace/test/cmd/baddof/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/dtrace/test/cmd/baddof/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/cmd/Makefile.cmd

@@ -40,6 +41,9 @@

 CERRWARN += -Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 $(CMDS) := FILEMODE = 0555

 all: $(SRCS)
--- a/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/cmd/Makefile.cmd

@@ -40,6 +41,9 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-unused-variable

+# not linted
+SMATCH=off
+
 $(CMDS) := FILEMODE = 0555

 all: $(SRCS)
--- a/usr/src/cmd/dtrace/test/tst/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/dtrace/test/tst/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/cmd/Makefile.cmd

@@ -55,6 +56,9 @@
 CERRWARN +=	-Wno-unused-function
 CERRWARN +=	-Wno-unused-variable

+# not linted
+SMATCH=off
+
 all: $(EXES)

 clean:
--- a/usr/src/cmd/ed/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ed/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= ed

@@ -36,6 +37,10 @@
 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-unused-function
 CERRWARN += -Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 CFLAGS += -DXPG4 -DXPG6 -I$(SRC)/lib/libc/inc
 LDLIBS += -lmapmalloc -lgen -lcrypt_i
 XGETFLAGS += -a -x ed.xcl
--- a/usr/src/cmd/eeprom/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/eeprom/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 #	Create default so empty rules don't
@@ -41,6 +42,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 SOURCES = $(OBJS:%.o=%.c)

 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/enhance/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/enhance/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG= enhance

@@ -40,6 +39,8 @@
 	-D__EXTENSIONS__=1


+SMOFF += all_func_returns
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/expand/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/expand/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/expand/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		expand  unexpand
 SRCS=		$(PROG:=.c)
@@ -37,9 +36,11 @@

 CLOBBERFILES += expand_cmd.c

+SMOFF += signed
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTPROG)
--- a/usr/src/cmd/expr/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/expr/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= expr

@@ -31,6 +32,8 @@

 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-extra
+# "missing type for func"
+SMATCH=off
 CFLAGS += -DXPG4 -DXPG6

 XGETFLAGS += -a -x expr.xcl
--- a/usr/src/cmd/exstr/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/exstr/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG= exstr
@@ -29,9 +30,12 @@

 CERRWARN += -Wno-extra

+# "missing type for func"
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTPROG)
--- a/usr/src/cmd/factor/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/factor/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= factor

@@ -30,6 +31,9 @@
 LDLIBS += -lm
 CERRWARN += -Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/fcinfo/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fcinfo/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 COMMONBASE = ../../common

@@ -49,6 +49,9 @@

 CERRWARN += -Wno-unused-variable

+# not linted
+SMATCH=off
+
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORK)

 LDLIBS += -lHBAAPI
--- a/usr/src/cmd/fdformat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fdformat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fdformat/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG= fdformat

@@ -31,6 +30,9 @@

 LDLIBS +=	-lvolmgt

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 #
@@ -38,7 +40,7 @@
 #
 $(ROOTPROG) := FILEMODE = 04555

-all: $(PROG)
+all: $(PROG)

 fdformat: fdformat.c
 	$(LINK.c) -o $@ ./fdformat.c $(LDLIBS)
--- a/usr/src/cmd/fdisk/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fdisk/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 #       Makefile for fdisk

@@ -33,6 +33,9 @@
 include ../Makefile.cmd


+# not linted
+SMATCH=off
+
 LDLIBS_i386= -lfdisk
 LDLIBS_sparc=
 LDLIBS += -ladm -lefi $(LDLIBS_$(MACH))
--- a/usr/src/cmd/ficl/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ficl/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -12,6 +12,7 @@
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= ficl-sys
 OBJS= main.o
@@ -23,6 +24,8 @@
 LDLIBS += -lficl-sys -ltecla -lumem
 CPPFLAGS += -I$(SRC)/common/ficl

+SMOFF += all_func_returns
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/filesync/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/filesync/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= filesync

@@ -35,6 +36,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 FILEMODE= 0555

 .KEEP_STATE:
--- a/usr/src/cmd/flowstat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/flowstat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=flowstat

@@ -38,6 +39,9 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 ROOTCFGDIR=	$(ROOTETC)/dladm

 .KEEP_STATE:
--- a/usr/src/cmd/fm/eversholt/Makefile.esc.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/eversholt/Makefile.esc.com	Sun May 19 22:05:19 2019 -0400
@@ -17,12 +17,12 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-#
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Copyright 2018 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #

 FMADIR = $(SRC)/cmd/fm
@@ -47,6 +47,8 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-switch

+SMOFF += all_func_returns
+
 CTFCONVO = $(CTFCONVERT_O)
 CTFMRG = $(CTFMERGE) -L VERSION -o $@ $(OBJS)
--- a/usr/src/cmd/fm/fmd/Makefile.fmd	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #

 .KEEP_STATE:
@@ -120,6 +121,9 @@
 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-clobbered

+# not linted
+SMATCH=off
+
 $(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo -ldiagcode -lsysevent -lsmbios \
 		-luuid -lnvpair -lexacct -lumem -ldevinfo -lfmd_msg
--- a/usr/src/cmd/fm/fmstat/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/fmstat/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 .KEEP_STATE:
 .SUFFIXES:
@@ -43,6 +44,8 @@
 LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm
 LDFLAGS += -R/usr/lib/fm

+SMOFF += signed
+
 .NO_PARALLEL:
 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/fm/fmtopo/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/fmtopo/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -24,7 +24,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2018, Joyent, Inc.

 .KEEP_STATE:
 .SUFFIXES:
@@ -43,6 +43,9 @@
 LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -lnvpair
 LDFLAGS += -R/usr/lib/fm

+# not linted
+SMATCH=off
+
 .NO_PARALLEL:
 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 MODULE = disk-monitor
 CLASS = common
@@ -34,3 +35,6 @@
 LDLIBS += -lsysevent -lnvpair -lsmbios -lcfgadm -ltopo -luutil -lipmi
 LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
 CERRWARN += -Wno-uninitialized
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/fm/modules/common/eversholt/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/modules/common/eversholt/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -25,6 +25,7 @@
 #
 # eft.so (the eversholt DE)
 #
+# Copyright (c) 2018, Joyent, Inc.

 .KEEP_STATE:

@@ -49,6 +50,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 $(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo
--- a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 MODULE = fabric-xlate
 CLASS = common
@@ -40,3 +41,6 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/fm/modules/common/ip-transport/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/modules/common/ip-transport/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 MODULE = ip-transport
 CLASS = common
@@ -32,3 +33,6 @@
 include ../../Makefile.plugin

 CERRWARN += -Wno-uninitialized
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,8 @@
 #
 #Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

-
 MODULE = ses-log-transport
 CLASS = common
 SRCS = ses_log_transport.c
@@ -32,3 +32,6 @@
 CFLAGS += $(INCS)
 LDLIBS += -L$(ROOTLIB)/fm -ltopo -lseslog
 LDFLAGS += -R/usr/lib/fm
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/fmt/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fmt/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,7 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fmt/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG= fmt

@@ -36,6 +36,9 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/fold/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fold/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -19,21 +19,21 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= fold

 include ../Makefile.cmd


+SMOFF += index_overflow
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTPROG)
--- a/usr/src/cmd/format/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/format/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG= format

@@ -51,6 +51,9 @@
 CERRWARN += -Wno-unused-label
 CERRWARN += -Wno-clobbered

+# not linted
+SMATCH=off
+
 SRCS= $(OBJS:.o=.c)

 ROOTETCDATA= $(ROOTETC)/$(DATA)
--- a/usr/src/cmd/fs.d/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -19,6 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #

@@ -79,6 +80,9 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 $(DFPROG) :=	LDLIBS += -lcmdutils
 $(SPPROG) :=	LDLIBS += -lkstat
--- a/usr/src/cmd/fs.d/autofs/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/autofs/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #

 FSTYPE=		autofs
@@ -93,6 +94,9 @@
 CERRWARN +=	-Wno-unused-label
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 OBJS=		$(AUTOOBJS) $(MOUNTOBJS) $(TYPEOBJS) \
 		$(SHAREOBJS) $(UNSHAREOBJS)
--- a/usr/src/cmd/fs.d/hsfs/labelit/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/hsfs/labelit/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		hsfs
 LIBPROG=	labelit
@@ -32,4 +33,5 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-unused-variable

-
+# not linted
+SMATCH=off
--- a/usr/src/cmd/fs.d/hsfs/mount/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/hsfs/mount/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		hsfs
 LIBPROG=	mount
@@ -40,3 +41,6 @@
 include		../../Makefile.mount.targ

 CERRWARN +=	-Wno-unused-variable
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/fs.d/nfs/clear_locks/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/clear_locks/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,11 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= clear_locks

@@ -51,9 +50,12 @@


+# not linted
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTUSRSBINPROG)
--- a/usr/src/cmd/fs.d/nfs/dfmounts/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/dfmounts/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 LIBPROG=	dfmounts
@@ -43,6 +44,9 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-parentheses

+# unknown type for func
+SMATCH =	off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/nfs/dfshares/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/dfshares/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 LIBPROG=	dfshares
@@ -37,6 +38,10 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/nfs/lockd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/lockd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 FSTYPE	  =	nfs
@@ -45,6 +46,10 @@
 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
+
 $(TYPEPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/nfs/mount/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/mount/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2017, Joyent, Inc. All rights reserved.
+# Copyright 2018, Joyent, Inc. All rights reserved.
 #
 # cmd/fs.d/nfs/mount/Makefile

@@ -50,6 +50,9 @@
 CERRWARN += -Wno-address
 CERRWARN += -Wno-unused-function

+# unknown type for func
+SMATCH=off
+
 #
 # Message catalog
 #
--- a/usr/src/cmd/fs.d/nfs/mountd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/mountd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE	  =	nfs
 TYPEPROG  =	mountd
@@ -44,6 +45,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-switch

+# not linted
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(COMPILE.d) -s $(DSRC) -o $(DOBJ) $(OBJS)
 		$(LINK.c) -o $@ $(DOBJ) $(OBJS) $(LDLIBS)
--- a/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 TYPEPROG=	nfs4cbd
@@ -38,6 +39,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-extra

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:	$(TYPEPROG)
--- a/usr/src/cmd/fs.d/nfs/nfsd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/nfsd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 TYPEPROG=	nfsd
@@ -42,6 +42,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-extra

+# not linted
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/nfs/nfslog/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/nfslog/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 TYPEPROG=	nfslogd
@@ -41,6 +42,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-type-limits

+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
--- a/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+

 FSTYPE	  =	nfs
 TYPEPROG  =	nfsmapid
@@ -44,6 +46,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 all:		$(TYPEPROG) $(TESTPROG)

 $(TYPEPROG):	$(OBJS) $(DSRC)
--- a/usr/src/cmd/fs.d/nfs/nfsref/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/nfsref/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/nfsref/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		nfsref

@@ -36,6 +36,9 @@

 CERRWARN += -Wno-unused-variable

+# not linted
+SMATCH=off
+
 LDLIBS += -lreparse -lnvpair -lumem

 $(PROG):	$(OBJS)
--- a/usr/src/cmd/fs.d/nfs/nfsstat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/nfsstat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/nfsstat/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		nfsstat

@@ -41,6 +41,10 @@

 CPPFLAGS += -I$(STATCOMMONDIR)
 CERRWARN += -Wno-parentheses
+
+# not linted
+SMATCH=off
+
 LDLIBS += -lkstat

 $(PROG):	$(OBJS)
--- a/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libnfs_basic.a
 VERS =		.1
@@ -41,6 +42,9 @@

 CPPFLAGS +=	-I$(SRC)/cmd/fs.d/nfs/lib

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/cmd/fs.d/nfs/rquotad/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/rquotad/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 TYPEPROG=	rquotad
@@ -36,6 +37,9 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-unused-variable

+# unknown type for func
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(LDLIBS) $(OBJS)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/nfs/showmount/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/showmount/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 LIBPROG=	showmount
@@ -47,6 +48,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/nfs/statd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/statd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -30,6 +30,7 @@
 #
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 TYPEPROG=	statd
@@ -43,6 +44,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 LOCAL=		sm_svc.o sm_proc.o sm_statd.o
 OBJS=		$(LOCAL) selfcheck.o daemon.o smfcfg.o
--- a/usr/src/cmd/fs.d/nfs/tests/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/nfs/tests/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/tests/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		nfs
 LIBPROG=	test_svc_tp_create
@@ -35,6 +35,9 @@

 CFLAGS += $(CCVERBOSE)

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lnsl

 # message catalog
--- a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,10 +22,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-
-#
-# cmd/fs.d/smbclnt/smbiod-svc/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		smbfs
 TYPEPROG=	smbiod-svc
@@ -41,6 +38,9 @@
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common

+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
--- a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@

 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 #
@@ -38,13 +39,14 @@

 CSTD= $(CSTD_GNU99)

-# This is a multi-thread program but Nevada
-# no longer needs -lthread
 LDLIBS += -lsmbfs -lumem

 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common

+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
--- a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 #
@@ -52,6 +53,9 @@
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common

+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
--- a/usr/src/cmd/fs.d/udfs/fsck/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/udfs/fsck/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright (c) 1999 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		udfs
 LIBPROG=	fsck
@@ -40,6 +41,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
 OBJS=		$(FSCKOBJS) $(UDFSOBJS)
 SRCS=		$(FSCKSRCS) $(UDFSSRCS) ../mkfs/udfslib.c
--- a/usr/src/cmd/fs.d/udfs/fsdb/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/udfs/fsdb/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2017, Joyent Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 FSTYPE=		udfs
@@ -48,6 +48,9 @@
 CERRWARN +=	-Wno-unused-value
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 SRCS=	fsdb.c ud_lib.c

 fsdb : fsdb_yacc.o fsdb_lex.o ud_lib.o fsdb.o $(MAPFILES)
--- a/usr/src/cmd/fs.d/udfs/mkfs/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/udfs/mkfs/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright (c) 1999,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		udfs
 LIBPROG=	mkfs
@@ -48,6 +49,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 OBJS=		$(MKFSOBJS) $(UDFSOBJS)
 SRCS=		$(OBJS:%.o=%.c)
--- a/usr/src/cmd/fs.d/ufs/df/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/df/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	df
@@ -39,6 +40,9 @@
 CERRWARN +=	-Wno-unused-label
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 # for messaging catalogue file
 #
 POFILE= df.po
--- a/usr/src/cmd/fs.d/ufs/edquota/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/edquota/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	edquota
@@ -35,5 +36,8 @@

 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
 $(ROOTUSRSBIN)/$(LIBPROG):
 		-$(RM) $@; $(SYMLINK) $(LINKVALUE) $@
--- a/usr/src/cmd/fs.d/ufs/ff/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/ff/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	ff
@@ -40,6 +41,9 @@

 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/ufs/fsck/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/fsck/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	fsck
@@ -51,6 +52,9 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(CTFMERGE_HOOK)
 		$(POST_PROCESS)
--- a/usr/src/cmd/fs.d/ufs/fsdb/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/fsdb/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	fsdb
@@ -36,5 +37,8 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 SRCS=	$(LIBPROG).c
--- a/usr/src/cmd/fs.d/ufs/fssnap/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/fssnap/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,9 @@
 #
 #
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	fssnap
@@ -42,6 +43,10 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lkstat -ldevinfo

 # message catalog
--- a/usr/src/cmd/fs.d/ufs/labelit/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/labelit/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,15 +20,16 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989,1996,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/fs.d/ufs/labelit/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	labelit
 ATTMK=		$(LIBPROG)

 include		../../Makefile.fstype
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/fs.d/ufs/lockfs/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/lockfs/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1991,1996,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/fs.d/ufs/lockfs/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	lockfs
@@ -37,6 +35,7 @@
 include		../../Makefile.fstype


+SMOFF += all_func_returns

 $(ROOTUSRSBIN)/$(LIBPROG):
 	$(RM) $@; $(SYMLINK) $(LINKVALUE) $@
--- a/usr/src/cmd/fs.d/ufs/newfs/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/newfs/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	newfs
@@ -38,6 +39,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 OBJS=		$(LIBPROG).o $(FSLIB)
 SRCS=		$(LIBPROG).c $(FSLIBSRC)
--- a/usr/src/cmd/fs.d/ufs/quot/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/quot/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/ufs/quot/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	quot
@@ -38,7 +36,8 @@

 LDLIBS	+=	-ladm

-
+# not linted
+SMATCH=off

 $(ROOTUSRSBIN)/$(LIBPROG):
 		-$(RM) $@; $(SYMLINK) $(LINKVALUE) $@
--- a/usr/src/cmd/fs.d/ufs/quota/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/quota/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/ufs/quota/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	quota
@@ -42,6 +42,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
 FILEMODE= 04555

 $(LIBPROG):	$(OBJS)
--- a/usr/src/cmd/fs.d/ufs/quotacheck/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/quotacheck/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	quotacheck
@@ -41,6 +42,8 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-type-limits

+# not linted
+SMATCH=off

 $(FSOBJS): $(FSSRCS)
 	$(COMPILE.c) -o $@ $(FSSRCS)
--- a/usr/src/cmd/fs.d/ufs/quotaon/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/quotaon/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Use is subject to license terms.
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #
-# cmd/fs.d/ufs/quotaon/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	quotaon
@@ -42,6 +42,8 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off

 $(ROOTLIBFSTYPE)/$(QUOTAOFF):	$(ROOTLIBFSTYPE)/$(LIBPROG)
 		-$(RM) $@; $(LN) $(ROOTLIBFSTYPE)/$(LIBPROG) $@
--- a/usr/src/cmd/fs.d/ufs/repquota/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/repquota/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	repquota
@@ -37,6 +38,8 @@
 CERRWARN +=	-Wno-type-limits
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off

 $(ROOTUSRSBIN)/$(LIBPROG):
 		-$(RM) $@; $(SYMLINK) $(LINKVALUE) $@
--- a/usr/src/cmd/fs.d/ufs/tunefs/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/tunefs/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996, by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	tunefs
@@ -38,6 +39,8 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off

 $(ROOTUSRSBIN)/$(LIBPROG):	FRC
 		-$(RM) $@; $(SYMLINK) $(LINKVALUE) $@
--- a/usr/src/cmd/fs.d/ufs/volcopy/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fs.d/ufs/volcopy/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 1989,2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 FSTYPE=		ufs
 LIBPROG=	volcopy
@@ -34,6 +35,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS += 	-lmapmalloc

 # for messaging catalog
--- a/usr/src/cmd/fwflash/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/fwflash/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fwflash/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 #
 # common rules for $SRC/cmd/fwflash

@@ -30,6 +29,9 @@
 CERRWARN +=		-Wno-uninitialized
 CERRWARN +=		-Wno-address

+# not linted
+SMATCH=off
+
 ROOTUSR=                $(ROOT)/usr
 ROOTUSRINCLD=		$(ROOTUSR)/include
 ROOTUSRINCLDFWFLASH=	$(ROOTUSRINCLD)/fwflash
--- a/usr/src/cmd/gencat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/gencat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= gencat

@@ -33,6 +34,9 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-unused-value

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/grpck/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/grpck/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1990 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= grpck

@@ -29,6 +30,9 @@

 CERRWARN += -Wno-unused-variable

+# not linted
+SMATCH=off
+
 RELUSRSBIN=	../usr/sbin

 .KEEP_STATE:
--- a/usr/src/cmd/gss/gsscred/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/gss/gsscred/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 SBINPROG = gsscred

@@ -46,9 +47,12 @@

 COPTFLAG += $(INCDIRS) $(LIBPATH)

+# not linted
+SMATCH=off
+
 LDLIBS += -lgss

-$(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50
+$(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50

 .KEEP_STATE:
--- a/usr/src/cmd/gss/gssd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/gss/gssd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 TESTPROG = gssdtest

@@ -37,7 +38,7 @@

 GD_OBJS	= gssd_svc.o
 GC_OBJS	= gssd_clnt.o
-G_OBJS	= gssd_xdr.o
+G_OBJS	= gssd_xdr.o
 GSSDOBJS = $(GSSD_BASEOBJS) $(GD_OBJS) $(G_OBJS)
 GSSCOBJS = $(GSSC_BASEOBJS) $(GC_OBJS) $(G_OBJS)

@@ -65,13 +66,15 @@
 DIRS=	$(ROOTLIB)

 CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
-COPTFLAG += #-I$(KINCDIR)

 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS += -lgss

 gssd :=	MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
--- a/usr/src/cmd/iconv/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/iconv/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -11,7 +11,7 @@

 #
 # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
-# Copyright 2017 Joyent Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=iconv
@@ -30,6 +30,9 @@

 CERRWARN +=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 CLEANFILES	= $(OBJS) parser.tab.c parser.tab.h
 CLOBBERFILES	= $(PROG) $(POFILE)
 PIFILES		= $(OBJS:%.o=%.i)
--- a/usr/src/cmd/idmap/idmap/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/idmap/idmap/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		idmap
 CLIENTOBJS =	idmap.o idmap_engine.o namemaps.o
@@ -41,6 +42,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 POFILE = 	$(PROG)_all.po
 LDLIBS +=	-lidmap -ladutils -lsldap -lldap
 FILEMODE =	0555
--- a/usr/src/cmd/idmap/idmapd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/idmap/idmapd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		idmapd
 MANIFEST =	idmap.xml
@@ -63,6 +64,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 TEXT_DOMAIN =	SUNW_OST_OSLIB

 CSTD = $(CSTD_GNU99)
--- a/usr/src/cmd/init/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/init/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= init
 ROOTFS_PROG= $(PROG)
@@ -37,6 +38,9 @@
 CERRWARN += -Wno-uninitialized
 CLOBBERFILES= $(STATIC)

+# needs work
+SMATCH=off
+
 .KEEP_STATE:

 all: $(ROOTFS_PROG)
--- a/usr/src/cmd/ipf/Makefile.ipf	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ipf/Makefile.ipf	Sun May 19 22:05:19 2019 -0400
@@ -24,8 +24,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#cmd/ipf/Makefile.ipf
-#
+# Copyright (c) 2018, Joyent, Inc.


 LIBIPF=		../../lib/$(MACH)/libipf.a
@@ -43,3 +42,6 @@
 CERRWARN	+= -Wno-parentheses
 CERRWARN	+= -Wno-unused-function
 CERRWARN	+= -Wno-empty-body
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/iscsiadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/iscsiadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG = iscsiadm
 OBJS = cmdparse.o sun_ima.o iscsiadm_main.o
@@ -44,6 +44,9 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 FILEMODE= 0555

 .KEEP_STATE:
--- a/usr/src/cmd/isns/isnsadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/isns/isnsadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = isnsadm
 SRCS = cmdparse.c isnsadm.c isnsadm_msg.c
@@ -38,6 +39,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/isns/isnsd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/isns/isnsd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -25,7 +25,7 @@

 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG = isns
@@ -60,6 +60,9 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 CLOBBERFILES += $(DTRACE_HEADER)

 LDLIBS		+= -lsecdb -lscf -lxml2
--- a/usr/src/cmd/keyserv/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/keyserv/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 SBINPROG = keyserv newkey
 BINPROG	= keylogout keylogin domainname chkey
@@ -73,6 +74,9 @@
 CERRWARN +=	-Wno-address
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 chkey :=	LDLIBS += -lsldap -lmp -lmd
 keyserv :=	LDLIBS += -lmp -lmd
 newkey  :=	LDLIBS += -lsldap -lmp -lmd
--- a/usr/src/cmd/krb5/kadmin/cli/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kadmin/cli/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= kadmin kadmin.local
 SHFILES= k5srvutil
@@ -37,7 +38,7 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-unused-variable

-COPTFLAG += #-I$(KINCDIR)
+SMATCH=off

 SHAREDLIBS = -lmech_krb5 -lss
--- a/usr/src/cmd/krb5/kadmin/dbutil/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kadmin/dbutil/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= kdb5_util

@@ -40,6 +41,9 @@
 CERRWARN += -Wno-unused-function
 CERRWARN += -Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb \
 	-lmech_krb5
--- a/usr/src/cmd/krb5/kadmin/kclient/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kadmin/kclient/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Makefile for Kerberos client-install utility.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		ksetpw \
 		kdyndns \
@@ -64,6 +65,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 ksetpw:=	LDFLAGS += $(KRUNPATH)
 kdyndns:=	LDFLAGS += -R/usr/lib/smbsrv
 ksmb:=		LDFLAGS += -R/usr/lib/smbsrv
--- a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	kdcmgr
 KLPROG=	klookup
@@ -37,6 +38,9 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS	+=	-lresolv

 CLOBBERFILES +=	$(KLPROG)
--- a/usr/src/cmd/krb5/kadmin/kpasswd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kadmin/kpasswd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= kpasswd

@@ -35,6 +36,9 @@
 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(KRB5LIBDIR)
 LDLIBS += $(KMECHLIB) $(KCLNTLIB)
--- a/usr/src/cmd/krb5/kadmin/ktutil/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kadmin/ktutil/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= ktutil

@@ -28,6 +29,9 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += $(KMECHLIB) $(ROOT)$(KERBLIBDIR)/libss.so
--- a/usr/src/cmd/krb5/kadmin/server/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kadmin/server/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= kadmind
 MANIFEST=	kadmin.xml
@@ -47,6 +48,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -lgss -L$(KRB5LIB) \
 	-lmech_krb5 -lkadm5srv -lkdb -lresolv -lpam
--- a/usr/src/cmd/krb5/kdestroy/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kdestroy/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= kdestroy

@@ -15,6 +16,9 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 POFILE = kdestroy.po
 POFILES = generic.po
--- a/usr/src/cmd/krb5/kinit/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kinit/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= kinit

@@ -17,6 +18,9 @@
 CERRWARN += -Wno-unused-function
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 POFILE = kinit.po
 POFILES = generic.po
--- a/usr/src/cmd/krb5/klist/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/klist/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,7 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG= klist

@@ -28,6 +28,9 @@
 LDLIBS += $(KMECHLIB)
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 $(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50

 .KEEP_STATE:
--- a/usr/src/cmd/krb5/kproplog/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kproplog/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG		=	kproplog

@@ -37,6 +38,9 @@
 CERRWARN	+=	-Wno-unused-function
 CERRWARN	+=	-Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 all:		$(PROG)

 $(PROG):	$(OBJS) $(DERIVED_OBJS)
--- a/usr/src/cmd/krb5/krb5kdc/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/krb5kdc/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= krb5kdc
 MANIFEST=	krb5kdc.xml
@@ -56,6 +57,9 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L$(ROOT_KLIBDIR) -L$(KRB5LIB) \
 	  -lmech_krb5 -lkdb -lkadm5srv -lc
--- a/usr/src/cmd/krb5/kwarn/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/kwarn/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 TESTPROG = kwarndtest

@@ -55,6 +56,9 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
 CPPFLAGS += -I../../lib/gss_mechs/mech_krb5/include \
                  -I$(SRC)/lib/gss_mechs/mech_krb5 \
                  -I$(SRC)/lib/gss_mechs/mech_krb5/include \
--- a/usr/src/cmd/krb5/ldap_util/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/ldap_util/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= kdb5_ldap_util

@@ -65,6 +66,9 @@
 CERRWARN +=	-Wno-unused-function
 CERRWARN +=	-Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb -lkdb_ldap \
 	-lmech_krb5
--- a/usr/src/cmd/krb5/slave/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/krb5/slave/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG1=kprop
 PROG2=kpropd
@@ -63,6 +64,9 @@
 CERRWARN +=	-Wno-unused-value
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 LDFLAGS +=	$(KRUNPATH) $(KERBRUNPATH)
 LDLIBS +=	-lmech_krb5
 $(PROG1) :=	LDLIBS += -L$(KRB5LIB) -lkadm5srv
--- a/usr/src/cmd/last/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/last/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/last/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG= last
 UTMPS= wtmpx
@@ -33,6 +32,9 @@

 include ../Makefile.cmd

+# not linted
+SMATCH=off
+
 $(ROOTUTMPS):= FILEMODE= 644

 $(ROOTADM)/%: %
--- a/usr/src/cmd/ldap/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ldap/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 # cmd/ldap/Makefile.com
 # Native LDAP II commands (makestyle clean).
@@ -87,6 +88,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 all:=           TARGET= all
 install:=       TARGET= install
 clean:=         TARGET= clean
--- a/usr/src/cmd/ldapcachemgr/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ldapcachemgr/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	ldap_cachemgr

@@ -48,6 +49,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 # Message files
 POFILE=		ldap_cachemgr.po
 POFILES=	${OBJS:%.o=%.po}
--- a/usr/src/cmd/listen/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/listen/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 PROG= listen nlps_server

 DBGOBJ	= doprnt.o
@@ -61,6 +63,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 $(LIBSAFD)/% : %
 	$(INS.file)
--- a/usr/src/cmd/loadkeys/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/loadkeys/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= loadkeys dumpkeys
 sparc_SUBDIRS= type_4 type_6 type_101
@@ -42,6 +43,9 @@
 CERRWARN += -Wno-unused-label
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 CLOBBERFILES = $(PROG) loadkeys.c

 .KEEP_STATE:
--- a/usr/src/cmd/lockstat/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/lockstat/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= lockstat
 OBJS= lockstat.o sym.o
@@ -32,6 +33,8 @@
 LDLIBS += -lelf -lkstat -ldtrace
 CERRWARN += -Wno-uninitialized

+SMOFF += index_overflow
+
 FILEMODE= 0555

 CLEANFILES += $(OBJS)
--- a/usr/src/cmd/lofiadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/lofiadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= lofiadm
 OBJS= main.o utils.o
@@ -30,7 +31,7 @@

 SRCS= $(OBJS:%.o=%.c)

-POFILES= $(OBJS:%.o=%.po)
+POFILES= $(OBJS:%.o=%.po)

 include ../Makefile.cmd

@@ -40,6 +41,8 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off

 .KEEP_STATE:
--- a/usr/src/cmd/look/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/look/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= look
 DATADIR= dict
@@ -37,6 +38,9 @@

 CERRWARN +=	-Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 FILEMODE=	755

 $(ROOTDATADIR)/$(DATA):= FILEMODE=444
--- a/usr/src/cmd/luxadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/luxadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,11 +22,12 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = luxadm

 COBJS = adm.o fchba.o lux_util.o fabric_conf.o
-OBJS_sparc= g_adm.o diag.o fcalupdate.o hotplug.o qlgcupdate.o setboot.o
+OBJS_sparc= g_adm.o diag.o fcalupdate.o hotplug.o qlgcupdate.o setboot.o
 OBJS_i386 = x86_adm.o errormsgs.o
 OBJS = $(OBJS_$(MACH)) $(COBJS)

@@ -42,6 +43,9 @@
 CERRWARN +=	-Wno-unused-label
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 sparc_LDLIBS = -la5k -lg_fc -ldevid -lkstat -ldevinfo
 i386_LDLIBS =
 LDLIBS += $($(MACH)_LDLIBS)
--- a/usr/src/cmd/mdb/Makefile.mdb	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/mdb/Makefile.mdb	Sun May 19 22:05:19 2019 -0400
@@ -109,6 +109,8 @@
 CERRWARN += -Wno-implicit-function-declaration
 mdb_grammar.o := CERRWARN += -Wno-type-limits

+SMOFF += all_func_returns
+
 PROG = mdb
 OBJS = $(SRCS:%.c=%.o) mdb_demangle.o mdb_lex.o mdb_grammar.o
--- a/usr/src/cmd/mdb/Makefile.module	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/mdb/Makefile.module	Sun May 19 22:05:19 2019 -0400
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2013 by Delphix. All rights reserved.
-# Copyright 2015, Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 .KEEP_STATE:
@@ -106,6 +106,8 @@
 LDFLAGS64		+= $(ZTEXT)
 AS_CPPFLAGS		+= -D_ASM

+SMOFF += all_func_returns,index_overflow
+
 # Module type-specific compiler flags
 $(MODOBJS) :=			CFLAGS += $(C_BIGPICFLAGS) $(XREGSFLAG)
 $(MODOBJS) :=			CFLAGS64 += $(C_BIGPICFLAGS) $(XREGSFLAG)
--- a/usr/src/cmd/mdb/intel/amd64/ip/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/mdb/intel/amd64/ip/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 MODULE = ip.so
 MDBTGT = kvm
@@ -34,3 +35,6 @@
 include ../../../Makefile.module

 CPPFLAGS += -I$(SRCTOP)/include/inet
+
+# needs work
+SMOFF += shift_to_zero
--- a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/Makefile.master

@@ -39,6 +40,9 @@

 %.o := CPPFLAGS += $(PYCPPFLAGS)

+# not linted
+SMATCH=off
+
 dmod/$(MODULE) := LDLIBS += -lproc

 %.o: $(MODSRCS_DIR)/%.c
--- a/usr/src/cmd/mkmsgs/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/mkmsgs/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= mkmsgs

@@ -30,9 +31,12 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTPROG)
--- a/usr/src/cmd/modload/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/modload/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/modload/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 #
 # makefile for loadable module utilities

@@ -53,6 +53,9 @@

 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 # install specifics

 $(ROOTDRVPROG) := FILEMODE = 0555
--- a/usr/src/cmd/mpathadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/mpathadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/mpathadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 include ../Makefile.cmd

@@ -36,9 +36,12 @@
 LDLIBS += -lMPAPI -ldevid


+# not linted
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 $(PROG): $(OBJS)
 	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
--- a/usr/src/cmd/ndmpd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ndmpd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 #
@@ -50,6 +51,9 @@
 CPPFLAGS += -DDEBUG
 CPPFLAGS += -I. -Iinclude

+# not linted
+SMATCH=off
+
 CSTD = $(CSTD_GNU99)

 CERRWARN += -Wno-unused-variable
--- a/usr/src/cmd/ndmpstat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ndmpstat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#

 #
 # BSD 3 Clause License
@@ -47,6 +49,8 @@

 LDLIBS += -lndmp

+SMOFF += signed
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/news/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/news/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= news

@@ -31,6 +32,9 @@

 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/nl/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/nl/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 # Message catalog requires no special processing because messages
 # only occur in ./nl.c, not in ../expr/compile.c.

@@ -37,6 +39,9 @@
 CERRWARN += -Wno-unused-variable
 CPPFLAGS += -DXPG4

+# not linted
+SMATCH=off
+
 MAPFILE.INT =	../expr/mapfile-intf
 LDFLAGS +=	$(MAPFILE.INT:%=-Wl,-M%)
--- a/usr/src/cmd/nlsadmin/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/nlsadmin/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= nlsadmin

@@ -31,6 +32,9 @@
 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/nscd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/nscd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 # Makefile for name service cache daemon
 #
@@ -58,6 +59,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-type-limits

+# not linted
+SMATCH=off
+
 # nscd interposes on many symbols, and must export others for its own dlsym()
 # use, and dlsym() calls from libc.  Itemizing the interfaces within a mapfile
 # is error-prone, so establish the whole object as an interposer.
--- a/usr/src/cmd/nvmeadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/nvmeadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -28,6 +28,9 @@
 LDLIBS +=	-ldevinfo
 CSTD=	$(CSTD_GNU99)

+# error: cannot size expression
+SMATCH=off
+
 all: $(PROG)

 $(PROG): $(OBJS)
--- a/usr/src/cmd/oamuser/group/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/oamuser/group/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 #
 # Copyright (c) 2013 RackTop Systems.
 #
-# cmd/oamuser/group/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 include ../../Makefile.cmd

@@ -53,6 +52,9 @@
 CPPFLAGS=	-I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
 FILEMODE= 	0555

+# not linted
+SMATCH=off
+
 $(GROUPADD) :=	OBJS = $(ADD_OBJ)
 $(GROUPADD) :=	LDLIBS += $(LIBUSRGRP) -lcmdutils
--- a/usr/src/cmd/oamuser/lib/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/oamuser/lib/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= 	lib.a

@@ -62,6 +63,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-type-limits
 CERRWARN +=	-Wno-unused-variable
+# not linted
+SMATCH=off
+
 ARFLAGS=	cr
 AROBJS=		`$(LORDER) $(OBJS) | $(TSORT)`
--- a/usr/src/cmd/oamuser/user/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/oamuser/user/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 # Copyright (c) 2013 RackTop Systems.
 # Copyright (c) 2013 Gary Mills
 #
-# cmd/oamuser/user/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 DEFAULTFILES= useradd.dfl

@@ -74,6 +73,9 @@

 CPPFLAGS=	-I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)

+# not linted
+SMATCH=off
+
 $(INSSBINPROG)  := FILEMODE = 0555
 $(INSSYSADMPROG):= FILEMODE = 0500
 $(INSSKELFILE)  := FILEMODE = 0644
--- a/usr/src/cmd/passmgmt/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/passmgmt/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.


 PROG= 		passmgmt
@@ -42,6 +43,9 @@
 CERRWARN +=	-Wno-implicit-function-declaration
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 all: $(PROG) $(TXTS)

 XGETFLAGS= -a -x $(PROG).xcl
--- a/usr/src/cmd/perl/Makefile.targ	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/perl/Makefile.targ	Sun May 19 22:05:19 2019 -0400
@@ -11,7 +11,7 @@
 #
 # Copyright (c) 2014 Racktop Systems.
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
-#
+# Copyright (c) 2018, Joyent, Inc.

 # Link against libc as per solaris specs
 $(PERLEXT):= LDLIBS += -lc
@@ -32,6 +32,8 @@
 PCFLAGS64=-DPERL_EUPXS_ALWAYS_EXPORT \
 	-DPERL_USE_SAFE_PUTENV

+SMATCH=off
+
 $(MACH) $(MACH64):
 	$(INS.dir)
--- a/usr/src/cmd/pools/poolcfg/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/pools/poolcfg/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,9 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pools/poolbind/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		poolcfg
 OBJS =		poolcfg_lex.o poolcfg_grammar.o
@@ -49,6 +47,9 @@
 XGETFLAGS =	-a
 CLOBBERFILES +=	poolcfg_lex.c poolcfg_grammar.c poolcfg_grammar.h

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/power/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/power/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/power/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 DAEMON_SRCS =	powerd.c sysstat.c
 DAEMON_OBJS =	$(DAEMON_SRCS:%.c=%.o)
@@ -75,8 +74,10 @@
 $(ROOTLIBPOWER) := FILEMODE= 755
 $(ROOTLIBPOWERDAEMON) := FILEMODE= 555

-ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
-$(ROOTETCFILES) := FILEMODE= 644
+ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
+$(ROOTETCFILES) := FILEMODE= 644
+
+SMOFF += signed

 .PARALLEL: $(OBJS)
--- a/usr/src/cmd/powertop/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/powertop/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = powertop

@@ -41,6 +42,9 @@

 CERRWARN	+= -Wno-parentheses
 CERRWARN	+= -Wno-uninitialized
+
+SMOFF += free
+
 LDLIBS		+= -lncurses -ldtrace -lkstat

 FILEMODE	= 0555
--- a/usr/src/cmd/pr/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/pr/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= pr

@@ -33,6 +34,8 @@
 CERRWARN += -Wno-parentheses

 CPPFLAGS += -DXPG4
+SMOFF += indenting
+
 $(POFILE) := XGETFLAGS += -a -x pr.xcl

 .KEEP_STATE:
--- a/usr/src/cmd/prctl/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/prctl/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	prctl

@@ -35,6 +36,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS	+= -lproc -lproject
--- a/usr/src/cmd/prtvtoc/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/prtvtoc/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,10 +21,9 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/prtvtoc/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

-PROG= prtvtoc
+PROG= prtvtoc

 include ../Makefile.cmd

@@ -34,9 +33,12 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTUSRSBINPROG)
--- a/usr/src/cmd/ps/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ps/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/ps/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	ps

@@ -35,6 +34,9 @@

 LDLIBS += -lproject

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 %.o:	../%.c
--- a/usr/src/cmd/ptools/Makefile.bld	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ptools/Makefile.bld	Sun May 19 22:05:19 2019 -0400
@@ -25,6 +25,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG:sh = basename `cd ..; pwd`

@@ -69,6 +70,8 @@
 CERRWARN_pargs	+= -Wno-clobbered
 CERRWARN_pargs	+= -Wno-type-limits

+CERRWARN_pwait	+= -_smatch=off
+
 CERRWARN += $(CERRWARN_$(PROG))

 # pargs depends on ../../common/elfcap components
--- a/usr/src/cmd/rcap/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/rcap/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 # Definitions for targets shared by some subdirs, which have
@@ -35,6 +36,8 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-parentheses

+SMOFF += strcpy_overflow
+
 %.o: $(COMMON_DIR)/%.c
 	$(COMPILE.c) $<
 %.po: $(COMMON_DIR)/%.c
--- a/usr/src/cmd/rcm_daemon/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/rcm_daemon/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 include ../../Makefile.cmd
@@ -119,6 +120,9 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
 rcm_daemon := LDFLAGS += $(MAPFILES:%=-Wl,-M%)
--- a/usr/src/cmd/regcmp/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/regcmp/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= regcmp

@@ -29,6 +30,8 @@

 CERRWARN += -Wno-parentheses

+SMOFF += all_func_returns
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/rmformat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/rmformat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= rmformat

@@ -36,6 +37,8 @@

 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off

 $(ROOTBIN)/rmformat := FILEMODE = 04555

@@ -47,7 +50,7 @@
 	$(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)

-install: all $(ROOTPROG)
+install: all $(ROOTPROG)

 clean:
 	$(RM) $(OBJS)
--- a/usr/src/cmd/rmmount/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/rmmount/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		rmmount
 LOCAL_OBJS =	rmmount.o
@@ -47,6 +48,9 @@
 CERRWARN += -Wno-unused-function
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/rmvolmgr/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/rmvolmgr/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		rmvolmgr
 OBJS =		rmm_common.o rmvolmgr.o vold.o
@@ -48,6 +49,9 @@
 CERRWARN += 	-Wno-parentheses
 CERRWARN += 	-Wno-unused-function

+# not linted
+SMATCH=off
+
 ROOTCMDDIR =		$(ROOTLIB)
 ROOTMANIFESTDIR =	$(ROOTSVCSYSTEMFILESYSTEM)
 $(ROOTMANIFEST) :=	FILEMODE = 444
--- a/usr/src/cmd/rpcbind/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/rpcbind/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		rpcbind
 MANIFEST=	bind.xml
@@ -45,6 +46,9 @@
 $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG
 LDLIBS += -lwrap -lscf -lumem

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG) $(SVCMETHOD)
--- a/usr/src/cmd/rpcsvc/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/rpcsvc/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# cmd/rpcsvc/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROTOCOL_DIR= $(ROOT)/usr/include/rpcsvc

@@ -64,6 +63,10 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-extra
 CERRWARN += -Wno-unused-function
+
+# not linted
+SMATCH=off
+
 $(BINPROG) :=	LDLIBS += -lrpcsvc
 $(RPROG) :=	LDLIBS += -lrpcsvc
 $(SPROG) :=	LDLIBS += -lrpcsvc
--- a/usr/src/cmd/sa/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sa/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2013 Andrew Stormont.  All rights reserved.
 #
-# cmd/sa/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 MANIFEST =	sar.xml
 SVCMETHOD =	svc-sar
@@ -36,6 +35,8 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+SMOFF += all_func_returns
+
 GREP=		grep

 SADC= 		sadc
--- a/usr/src/cmd/saf/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/saf/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= sac sacadm pmadm

@@ -58,6 +59,9 @@
 CERRWARN += -Wno-unused-variable
 CERRWARN += -Wno-extra

+# too many untyped funcs
+SMATCH=off
+
 util1.o := CPPFLAGS += -DSAC
 util2.o := CPPFLAGS += -USAC
--- a/usr/src/cmd/sasinfo/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sasinfo/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 include ../Makefile.cmd

@@ -47,6 +47,8 @@

 CERRWARN += -Wno-unused-value

+SMOFF += indenting
+
 INCS += -I.
 INCS += -I$(SRC)/lib/smhba/common
 INCS += -I$(SRC)/lib/hbaapi/common
--- a/usr/src/cmd/savecore/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/savecore/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= savecore
 SRCS= ../savecore.c ../../../../../kernel/os/compress.c
@@ -32,6 +33,9 @@

 CPPFLAGS += -DBZ_NO_STDIO -I$(SRC)/uts/common

+# not linted
+SMATCH=off
+
 #
 # savecore is compiled with bits from $(SRC)/common/bzip2 and some function
 # symbols there are defined as weak; if you leave them out of
--- a/usr/src/cmd/script/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/script/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= script

@@ -30,9 +31,11 @@

 CERRWARN += -Wno-unused-variable

+SMOFF += all_func_returns
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTPROG)
--- a/usr/src/cmd/setfacl/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/setfacl/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1993 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= setfacl

@@ -31,11 +32,14 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS += -lsec

 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTPROG)
--- a/usr/src/cmd/sgs/ar/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/ar/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=		ar
@@ -39,6 +40,9 @@
 CSTD=	$(CSTD_GNU99)

 CERRWARN +=	-Wno-uninitialized
+
+SMOFF += signed
+
 LDLIBS +=	-lelf $(CONVLIBDIR) $(CONV_LIB) -lsendfile

 BLTDEFS =	msg.h
--- a/usr/src/cmd/sgs/crle/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/crle/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		crle

@@ -36,6 +37,9 @@

 OBJS=		$(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)

+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(SRC)/common/sgsrtcid -I$(SRCBASE)/uts/$(ARCH)/sys \
 		-D__EXTENSIONS__
 LLDFLAGS =	'-R$$ORIGIN/../lib'
--- a/usr/src/cmd/sgs/dump/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/dump/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		dump

@@ -43,4 +44,6 @@

 CERRWARN +=	-Wno-uninitialized

+SMOFF += indenting
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
--- a/usr/src/cmd/sgs/elfdump/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/elfdump/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@

 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=		elfdump
@@ -54,6 +55,9 @@

 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 BLTDEFS =	msg.h
 BLTDATA =	msg.c
 BLTMESG =	$(SGSMSGDIR)/elfdump
--- a/usr/src/cmd/sgs/error/i386/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/error/i386/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		error

@@ -42,6 +43,8 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-parentheses

+SMOFF += no_if_block,indenting
+
 %.o:		../common/%.c
 		$(COMPILE.c) $<
--- a/usr/src/cmd/sgs/gprof/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/gprof/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/sgs/gprof/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		gprof

@@ -44,6 +43,9 @@
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 ROOTLIBBLURB=	$(BLURBS:%=$(ROOTSHLIBCCS)/%)

 $(ROOTLIBBLURB) :=	FILEMODE=	444
--- a/usr/src/cmd/sgs/ldd/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/ldd/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		ldd

@@ -43,6 +44,8 @@
 LDFLAGS +=	$(VERSREF) $(CC_USE_PROTO) $(LLDFLAGS)
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB)

+SMOFF += or_vs_and
+
 BLTDEFS=        msg.h
 BLTDATA=        msg.c
 BLTMESG=        $(SGSMSGDIR)/ldd
--- a/usr/src/cmd/sgs/ldprof/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/ldprof/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@

 #
 # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY=	ldprof.a
@@ -47,6 +48,8 @@
 		$(CPPFLAGS.master) -I$(ELFCAP)
 CFLAGS +=	$(C_PICFLAGS)

+SMOFF += indenting
+
 LDLIBS +=	$(ZRECORD) -lmapmalloc -lc $(DLLIB)

 BLTDEFS=	msg.h
--- a/usr/src/cmd/sgs/libconv/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/libconv/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -90,6 +90,9 @@
 CERRWARN	+= -Wno-type-limits
 CERRWARN	+= -Wno-switch

+# not linted
+SMATCH=off
+
 CTFCONVERT_O=

 PICS=		$(OBJECTS:%=pics/%) pics/demangle.o
--- a/usr/src/cmd/sgs/libelf/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/libelf/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright 2015 Gary Mills
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY=	libelf.a
@@ -62,6 +63,8 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+SMOFF += indenting
+
 BUILD.AR=	$(RM) $@ ; \
 		$(AR) q $@ `$(LORDER) $(OBJECTS:%=$(DIR)/%)| $(TSORT)`
 		$(POST_PROCESS_A)
--- a/usr/src/cmd/sgs/libld/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/libld/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libld.a
 VERS =		.4
@@ -93,6 +94,8 @@
 CERRWARN += -Wno-char-subscripts
 CERRWARN += -Wno-type-limits

+SMOFF += no_if_block
+
 # Location of the shared relocation engines maintained under usr/src/uts.
 #
 KRTLD_I386 = $(SRCTOP)/arch/x86/kernel/krtld/32
--- a/usr/src/cmd/sgs/nm/amd64/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/nm/amd64/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		nm

@@ -43,6 +44,8 @@

 CERRWARN +=	-Wno-uninitialized

+SMOFF += precedence,indenting
+
 LDLIBS +=	$(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf
--- a/usr/src/cmd/sgs/nm/i386/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/nm/i386/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 #
 # Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# cmd/sgs/nm/i386/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		nm

@@ -43,6 +42,8 @@

 CERRWARN +=	-Wno-uninitialized

+SMOFF += precedence,indenting
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 CPPFLAGS += -DXPG4
--- a/usr/src/cmd/sgs/prof/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/prof/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/sgs/prof/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		prof

@@ -42,6 +41,10 @@
 CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
 CSTD=	$(CSTD_GNU99)
 CERRWARN +=	-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf

 %.o:		../common/%.c
--- a/usr/src/cmd/sgs/pvs/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/pvs/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		pvs

@@ -43,6 +44,9 @@
 LDLIBS +=	$(LDDBGLIBDIR) $(LDDBG_LIB) $(ELFLIBDIR) -lelf \
 		    $(CONVLIBDIR) $(CONV_LIB)

+# not linted
+SMATCH=off
+
 BLTDEFS=	msg.h
 BLTDATA=	msg.c
 BLTMESG=	$(SGSMSGDIR)/pvs
--- a/usr/src/cmd/sgs/rtld/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/rtld/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 RTLD=		ld.so.1

@@ -86,6 +87,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-switch

+# not linted
+SMATCH=off
+
 # These definitions require that libc be built in the same workspace
 # as the run-time linker and before the run-time linker is built.
 # This is required for the system's self-consistency in any case.
@@ -97,7 +101,7 @@
 		$(CPICLIB) $(CLIB) \
 		$(LDDBGLIBDIR) $(LDDBG_LIB) \
 		$(RTLDLIB) -lrtld \
-		$(LDLIB) $(LD_LIB)
+		$(LDLIB) $(LD_LIB)

 # The first few lines are essentially duplicating DYNFLAGS, but without the
 # CW & GCC argument prefixes.
--- a/usr/src/cmd/sgs/tools/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sgs/tools/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
@@ -65,3 +66,6 @@
 ROOTPROGS=	$(PROGS:%=$(ROOTDIR)/bin/%)

 FILEMODE=	0755
+
+# not linted
+SMATCH=off
--- a/usr/src/cmd/smbsrv/smbadm/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/smbsrv/smbadm/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=	smbadm
@@ -38,6 +39,8 @@

 CERRWARN += -Wno-uninitialized

+SMOFF += free
+
 all:		$(PROG)

 clean:
--- a/usr/src/cmd/smserverd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/smserverd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =	rpc.smserverd
 OBJS =	smediad.o smediad_err.o smed_svc.o smed_xdr.o
@@ -43,6 +44,9 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-unused-variable

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/sort/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sort/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 # Debugging targets
@@ -81,6 +82,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 CFLAGS += -DXPG4

 debug :=	SORT_DEBUG = -g -DDEBUG
--- a/usr/src/cmd/sqlite/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sqlite/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		sqlite

@@ -40,6 +41,9 @@

 CERRWARN +=	-Wno-empty-body

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsqlite-sys

 .KEEP_STATE:
--- a/usr/src/cmd/stat/fsstat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/stat/fsstat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = fsstat
 OBJS = fsstat.o
@@ -39,6 +40,8 @@
 FILEMODE= 0555


+SMOFF += signed
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/stat/vmstat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/stat/vmstat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = vmstat
 OBJS = vmstat.o
@@ -37,6 +38,9 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-parentheses
+
+SMOFF += signed
+
 FILEMODE= 0555
--- a/usr/src/cmd/streams/log/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/streams/log/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	strace strerr strclean

@@ -28,11 +29,13 @@

 CERRWARN += -Wno-unused-variable

+SMOFF += all_func_returns
+
 FILEMODE= 0555

 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTBIN)/strace
--- a/usr/src/cmd/sulogin/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sulogin/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		sulogin
 ROOTFS_PROG =	$(PROG)
@@ -32,6 +33,9 @@

 FILEMODE =	0555

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:		$(ROOTFS_PROG)
--- a/usr/src/cmd/sunpc/other/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sunpc/other/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
-# cmd/sunpc/other/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG= dos2unix unix2dos
 SRCS= ${PROG:%=%.c}
@@ -33,6 +33,9 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-unused-variable

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/svc/startd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/svc/startd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Milan Jurik. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG = svc.startd
@@ -71,6 +72,8 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized

+# these look like real bugs here, but ...
+SMOFF += impossible_mask,signed_integer_overflow_check

 %.o:	../common/%.c
 	$(COMPILE.c) $(OUTPUT_OPTION) $<
--- a/usr/src/cmd/svc/svccfg/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/svc/svccfg/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@

 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 MYPROG =	svccfg
@@ -81,6 +81,10 @@
 CERRWARN +=	-Wno-parentheses

 LFLAGS += -t
+
+# not linted
+SMATCH=off
+
 YFLAGS = -d

 CLOBBERFILES += svccfg_lex.c svccfg_grammar.c svccfg_grammar.h \
--- a/usr/src/cmd/swap/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/swap/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/swap/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	swap
 OBJS=	$(PROG).o
@@ -32,6 +32,9 @@

 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 FILEMODE=02555

 CLEANFILES += $(OBJS)
--- a/usr/src/cmd/sysdef/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/sysdef/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	sysdef
 OBJS=	$(PROG).o sdevinfo.o
@@ -32,6 +33,9 @@
 LDLIBS	+= -ldevinfo -lelf
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 FILEMODE= 02555

 CLEANFILES += $(OBJS)
--- a/usr/src/cmd/syslogd/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/syslogd/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= 		syslogd
 ROTATESCRIPT=	newsyslog
@@ -35,6 +36,10 @@

 $(PROG)		:= LDLIBS += -lscf
 CERRWARN	+= -Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 CPPFLAGS	+= -D_POSIX_PTHREAD_SEMANTICS
 CFLAGS		+= -DNDEBUG
--- a/usr/src/cmd/tail/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/tail/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -11,6 +11,7 @@

 #
 # Copyright 2010 Chris Love.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #


@@ -25,6 +26,8 @@

 CSTD=	$(CSTD_GNU99)

+SMOFF += leaks
+
 # install rules
 $(ROOTINC)/% : %
 	$(INS.file)
@@ -33,7 +36,7 @@

 .PARALLEL: $(OBJS)

-all:		$(PROG)
+all:		$(PROG)

 $(PROG):	$(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- a/usr/src/cmd/tar/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/tar/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG= tar
@@ -37,6 +38,9 @@

 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 CPPFLAGS += -DEUC

 ROOTSYMLINK=	$(ROOTPROG)
--- a/usr/src/cmd/tcpd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/tcpd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -4,6 +4,7 @@
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		safe_finger tcpd tcpdchk tcpdmatch try-from

@@ -26,6 +27,9 @@
 CERRWARN +=	-Wno-return-type
 CERRWARN +=	-Wno-clobbered

+# not linted
+SMATCH=off
+
 MAPFILE.INT.D=	mapfile-intf-tcpdchk
 MAPFILE.INT.M=	mapfile-intf-tcpdmatch
 MAPFILE.INT.F=	mapfile-intf-tryfrom
--- a/usr/src/cmd/truss/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/truss/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#
-# cmd/truss/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG=	truss
@@ -40,6 +39,9 @@
 CERRWARN	+= -Wno-uninitialized
 CERRWARN	+= -Wno-switch

+# not linted
+SMATCH=off
+
 CSTD=	$(CSTD_GNU99)

 LDLIBS	+= -lproc -lrtld_db -lc_db -lnvpair
--- a/usr/src/cmd/ttymon/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ttymon/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= stty ttymon ttyadm sttydefs

@@ -68,6 +69,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-extra

+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
--- a/usr/src/cmd/units/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/units/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= units
 UNITTAB=unittab
@@ -31,6 +32,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 LIBUNITTAB= $(UNITTAB:%=$(ROOTSHLIB)/%)
 $(LIBUNITTAB) :=	FILEMODE =	$(LIBFILEMODE)
--- a/usr/src/cmd/unlink/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/unlink/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= unlink

@@ -30,9 +31,12 @@
 CERRWARN += -Wno-implicit-function-declaration
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTUSRSBINPROG)
--- a/usr/src/cmd/utmpd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/utmpd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= utmpd
 DEFAULTFILES= utmpd.dfl
@@ -34,6 +35,8 @@

 FILEMODE = 555

+SMOFF += signed
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/volcheck/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/volcheck/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		volcheck
 LOCAL_OBJS =	volcheck.o
@@ -47,6 +48,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/volrmmount/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/volrmmount/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		volrmmount
 LOCAL_OBJS =	volrmmount.o
@@ -47,6 +48,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/vscan/vscand/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/vscan/vscand/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = vscand
 SRCS =	vs_main.c	\
@@ -44,6 +45,9 @@

 CERRWARN += -Wno-switch

+# not linted
+SMATCH=off
+
 CSTD =       $(CSTD_GNU99)

 MANIFEST = vscan.xml
--- a/usr/src/cmd/wall/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/wall/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2012 Joyent, Inc. All Rights Reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 PROG= wall
@@ -34,9 +34,11 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+SMOFF += leaks
+
 .KEEP_STATE:

-all: $(PROG)
+all: $(PROG)

 install: all $(ROOTUSRSBINPROG)
--- a/usr/src/cmd/whodo/amd64/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/whodo/amd64/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	whodo

@@ -34,6 +35,8 @@

 CERRWARN	+= -Wno-parentheses

+SMOFF += strcpy_overflow
+
 FILEMODE= 04555

 .KEEP_STATE:
--- a/usr/src/cmd/write/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/write/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/write/Makefile
+# Copyright (c) 2018, Joyent, Inc.

 PROG= write

@@ -37,6 +37,8 @@

 CERRWARN += -Wno-unused-variable

+SMOFF += all_func_returns
+
 all: $(PROG)

 install: all $(ROOTPROG)
--- a/usr/src/cmd/xargs/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/xargs/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG= 			xargs

@@ -35,6 +36,9 @@

 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/ypcmd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ypcmd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2015 Gary Mills
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright (c) 2018, Joyent, Inc.
 #

 BINPROG = ypmatch ypwhich ypcat
@@ -147,6 +148,9 @@
 CERRWARN +=	-Wno-address
 CERRWARN +=	-Wno-unused-function

+# too many unknown types
+SMATCH =	off
+
 #conditional assignments
 ypalias.o :=	CPPFLAGS= -DMAIN $(CPPFLAGS.master)
 makedbm.o :=	CPPFLAGS= $(CPPFLAGS.master)
--- a/usr/src/cmd/ypcmd/mknetid/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ypcmd/mknetid/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 1994, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = mknetid

@@ -36,6 +37,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-unused-function

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/ypcmd/revnetgroup/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ypcmd/revnetgroup/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 1996, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = revnetgroup

@@ -36,6 +37,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
@@ -46,7 +50,7 @@

 install: all $(ROOTUSRSBINPROG)

-clean:
+clean:
 	$(RM) $(OBJS)

 cstyle:
--- a/usr/src/cmd/ypcmd/yppasswd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ypcmd/yppasswd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 NETYPPROG =	rpc.yppasswdd
 DEFAULTFILES =	yppasswdd.dfl
@@ -56,6 +57,9 @@
 CERRWARN +=		-Wno-parentheses
 CERRWARN +=		-Wno-uninitialized

+# not linted
+SMATCH=off
+
 #
 # Objects shared between all the major components
 #
--- a/usr/src/cmd/ypcmd/ypupdated/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ypcmd/ypupdated/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 NETYPPROG =	rpc.ypupdated
 PROG =		$(NETYPPROG)
@@ -54,6 +55,9 @@
 CERRWARN +=		-Wno-implicit-function-declaration
 CERRWARN +=		-Wno-unused-variable

+# not linted
+SMATCH=off
+
 CLOBBERFILES += ypupdated_prot.h

 #conditional assignments
--- a/usr/src/cmd/zdb/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/zdb/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,7 +23,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
+# Copyright 2017 RackTop Systems.
 #

 PROG:sh=	cd ..; basename `pwd`
@@ -49,6 +50,8 @@
 CERRWARN += -Wsign-compare
 CERRWARN += -Wmissing-field-initializers

+SMOFF += 64bit_shift,all_func_returns
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/zlogin/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/zlogin/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG = zlogin

@@ -31,6 +32,9 @@

 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/cmd/zonecfg/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/zonecfg/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=	zonecfg
 OBJS=	zonecfg.o zonecfg_lex.o zonecfg_grammar.tab.o
@@ -46,6 +47,8 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-implicit-function-declaration

+SMOFF += all_func_returns
+
 CLOBBERFILES += $(PROG).ln

 .KEEP_STATE:
--- a/usr/src/cmd/zonestat/zonestat/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/zonestat/zonestat/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG =		zonestat
 SRCS =		zonestat.c
@@ -32,6 +33,9 @@

 CERRWARN	+= -Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 .PARALLEL:
--- a/usr/src/cmd/zonestat/zonestatd/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/zonestat/zonestatd/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 MANIFEST =	zonestat.xml
 SVCMETHOD =	svc-zonestat
@@ -41,6 +42,9 @@
 CERRWARN 	+= -Wno-unused-label
 CERRWARN 	+= -Wno-uninitialized

+# not linted
+SMATCH=off
+
 OBJS =		$(SRCS:%.c=%.o)

 .KEEP_STATE:
--- a/usr/src/cmd/zstreamdump/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/zstreamdump/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 PROG=		zstreamdump
 OBJS=		zstreamdump.o
@@ -42,6 +43,9 @@

 CERRWARN += -Wno-switch

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 .PARALLEL:
--- a/usr/src/cmd/ztest/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/cmd/ztest/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,8 @@
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
-#
+# Copyright 2017 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.

 PROG= ztest
 OBJS= $(PROG).o
@@ -44,6 +45,9 @@

 CERRWARN += -Wno-switch

+# false positive
+SMOFF += signed
+
 .KEEP_STATE:

 all: $(PROG)
--- a/usr/src/lib/brand/shared/librtld_db/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/brand/shared/librtld_db/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/lib/Makefile.lib

@@ -51,6 +52,9 @@
 			-I$(SRC)/cmd/sgs/include \
 			-I$(SRC)/cmd/sgs/include/$(MACH)

+# not linted
+SMATCH=off
+
 ROOTLIBDIR =	$(ROOT)/usr/lib/brand/$(BRAND)
 ROOTLIBDIR64 =	$(ROOT)/usr/lib/brand/$(BRAND)/$(MACH64)
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,12 +22,12 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= fp.a
 VERS= .1

-OBJECTS = cfga_fp.o cfga_rcm.o cfga_cs.o cfga_utils.o
+OBJECTS = cfga_fp.o cfga_rcm.o cfga_cs.o cfga_utils.o
 OBJECTS += cfga_cvt.o cfga_list.o cfga_rep.o

 # include library definitions
@@ -47,6 +47,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 CPPFLAGS += -I$(SRCTOP)/include
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= ib.a
 VERS= .1
@@ -44,6 +45,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-value

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair

 .KEEP_STATE:
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= pci.a
 VERS= .1
@@ -50,6 +51,9 @@
 CERRWARN +=	-Wno-char-subscripts
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= sbd.a
 VERS= .1
@@ -50,6 +51,9 @@
 CERRWARN +=	-Wno-char-subscripts
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(ROOT)/usr/platform/include -DSBD_DEBUG
 #
 #	Generate the error messages form sbd_ioctl.h
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= scsi.a
 VERS= .1
@@ -42,6 +43,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm

 .KEEP_STATE:
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= shp.a
 VERS= .1
@@ -51,6 +52,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-variable

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include $(SRC)/lib/cfgadm_plugins/Makefile.com

@@ -55,6 +56,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= usb.a
 VERS= .1
@@ -44,6 +45,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-value

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair

 .KEEP_STATE:
--- a/usr/src/lib/fm/libdiskstatus/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/fm/libdiskstatus/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libdiskstatus.a
 VERS=		.1
@@ -44,6 +44,9 @@
 LDLIBS +=	-lc -lnvpair
 CPPFLAGS +=	$(INCS)

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/fm/libfmd_msg/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/fm/libfmd_msg/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libfmd_msg.a
 VERS = .1
@@ -42,6 +43,9 @@
 CFLAGS64 += $(C_BIGPICFLAGS)
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized
+
+SMOFF += all_func_returns
+
 LDLIBS += -lnvpair -lc

 CLOBBERFILES += fmd_msg_test fmd_msg_test.core fmd_msg_test.out
--- a/usr/src/lib/fm/libseslog/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/fm/libseslog/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,12 +21,13 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.


 LIBRARY=	libseslog.a
 VERS=		.1

-OBJECTS=	libseslog.o
+OBJECTS=	libseslog.o

 include ../../../Makefile.lib
 include ../../Makefile.lib
@@ -39,6 +40,8 @@
 LDLIBS +=	-lc -lnvpair
 CPPFLAGS +=	$(INCS)

+# not linted
+SMATCH=off

 .KEEP_STATE:
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -83,6 +83,8 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-parentheses

+# not linted
+SMATCH=off

 $(DYNLIB)  := LDLIBS += \
 	-lnvpair -lelf -lumem -lxml2 -lkstat -luuid -ldevinfo \
--- a/usr/src/lib/fm/topo/modules/i86pc/chip/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/fm/topo/modules/i86pc/chip/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 MODULE = chip
 ARCH = i86pc
@@ -31,3 +32,6 @@

 include ../../Makefile.plugin
 LDLIBS += -lipmi -lfmd_agent -lumem -lsmbios
+
+# not linted
+SMATCH=off
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 # This make file will build mech_dh.so.1. This shared object
@@ -50,6 +51,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# needs work
+SMATCH=off
+
 DYNFLAGS +=	$(ZIGNORE)

 LIBS = $(DYNLIB)
--- a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 # The mech_dummy shared object contains all the functionality needed to
@@ -43,6 +44,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# needs work
+SMATCH=off
+
 SRCDIR =	../mech
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lgss -lc
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,8 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 # This make file will build mech_krb5.so.1. This shared object
 # contains all the functionality needed to support the Kereros V5 GSS-API
 # mechanism. No other Kerberos libraries are needed.
@@ -262,6 +264,9 @@
 CERRWARN +=	-Wno-empty-body
 CERRWARN +=	-Wno-address

+# needs work
+SMATCH=off
+
 MAPFILES =	../mapfile-vers
--- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-
+# Copyright (c) 2018, Joyent, Inc.

 #
 # This make file will build mech_spnego.so.1. This shared object
@@ -48,6 +48,9 @@
 CERRWARN +=	-Wno-unused-function
 CERRWARN +=	-Wno-type-limits

+# needs work
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/hal/libhal-storage/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/hal/libhal-storage/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,9 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# usr/src/lib/hal/libhal-storage/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libhal-storage.a
 VERS =		.1.0.0
@@ -45,6 +43,8 @@
 CPPFLAGS +=	-DPACKAGE_LOCALE_DIR=\"/usr/lib/locale\"
 CPPFLAGS +=	-I$(ROOT)/usr/include/hal

+SMOFF += all_func_returns
+
 ROOTMAJLINK =	$(ROOTLIBDIR)/$(LIBRARY:.a=.so)$(VERS_MAJ)
 ROOTMAJLINK64 =	$(ROOTLIBDIR64)/$(LIBRARY:.a=.so)$(VERS_MAJ)
--- a/usr/src/lib/hal/libhal/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/hal/libhal/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -25,6 +25,7 @@
 #
 # usr/src/lib/hal/libhal/Makefile.com
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libhal.a
 VERS =		.1.0.0
@@ -42,6 +43,8 @@
 CPPFLAGS +=	$(HAL_CONFIG_CPPFLAGS)
 CPPFLAGS +=	-DGETTEXT_PACKAGE=\"$(HAL_GETTEXT_PACKAGE)\" -DENABLE_NLS

+SMOFF += all_func_returns,leaks
+
 ROOTMAJLINK =	$(ROOTLIBDIR)/$(LIBRARY:.a=.so)$(VERS_MAJ)
 ROOTMAJLINK64 =	$(ROOTLIBDIR64)/$(LIBRARY:.a=.so)$(VERS_MAJ)
--- a/usr/src/lib/hbaapi/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/hbaapi/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.


 LIBRARY =	libHBAAPI.a
@@ -45,6 +46,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc
--- a/usr/src/lib/krb5/dyn/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/dyn/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+

 LIBRARY= libdyn.a
 VERS= .1
@@ -63,6 +65,8 @@

 CERRWARN +=	-Wno-unused-variable

+SMOFF += no_if_block
+
 .KEEP_STATE:

 all:	$(LIBS)
--- a/usr/src/lib/krb5/kadm5/clnt/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/kadm5/clnt/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libkadm5clnt.a
 VERS= .1
@@ -86,6 +87,8 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+SMOFF += all_func_returns,indenting,no_if_block
+
 LDLIBS +=	-lc

 .KEEP_STATE:
--- a/usr/src/lib/krb5/kadm5/srv/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/kadm5/srv/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libkadm5srv.a
 VERS= .1
@@ -93,6 +94,8 @@
 CERRWARN +=	-Wno-type-limits
 CERRWARN +=	-Wno-uninitialized

+SMOFF += all_func_returns,indenting
+
 .KEEP_STATE:

 all:	$(LIBS)
--- a/usr/src/lib/krb5/kdb/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/kdb/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libkdb.a
 VERS= .1
@@ -87,6 +88,8 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-parentheses

+SMOFF += indenting,all_func_returns,deref_check,signed
+
 DYNFLAGS +=	$(KRUNPATH) $(KMECHLIB)
 LDLIBS +=	-lc
--- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= db2.a
 VERS= .1
@@ -68,6 +69,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 LDLIBS +=	-L $(ROOTLIBDIR) -ldb2 -lkdb -lkadm5srv -lc
--- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libdb2.a
 VERS= .1
@@ -102,6 +103,10 @@

 CFLAGS +=	-I..
 CERRWARN +=	-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc

 # Identify that this library is an interposer (on dbm_ routines from libc.so.1).
--- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libkdb_ldap.a
 VERS= .1
@@ -76,6 +77,10 @@
 CFLAGS +=	-I..
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-unused-function
+
+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 LDLIBS +=	-L $(ROOTLIBDIR) -lkadm5srv -lc -lldap
--- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= pkinit.a
 VERS= .1
@@ -68,6 +68,9 @@
 CERRWARN	+= -Wno-uninitialized
 CERRWARN	+= -Wno-unused-function

+# not linted
+SMATCH=off
+
 CFLAGS +=	-I..
 DYNFLAGS +=	$(KRUNPATH) $(KMECHLIB) -Wl,-znodelete
 LDLIBS +=	-L $(ROOTLIBDIR) -lcrypto -lc
--- a/usr/src/lib/krb5/ss/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/krb5/ss/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libss.a
 VERS= .1
@@ -69,6 +70,8 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-unused-variable

+SMOFF += all_func_returns
+
 DYNFLAGS +=	$(KRUNPATH) $(KMECHLIB) $(ZIGNORE)

 LDLIBS +=	-lc -ltecla
--- a/usr/src/lib/libadm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libadm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libadm.a
 VERS=		.1
@@ -47,6 +48,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-char-subscripts

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc

 .KEEP_STATE:
--- a/usr/src/lib/libadutils/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libadutils/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libadutils.a
 VERS =		.1
@@ -44,6 +45,9 @@
 CERRWARN +=	-Wno-type-limits
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libbsdmalloc/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libbsdmalloc/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libbsdmalloc.a
 VERS=		.1
@@ -39,6 +40,9 @@
 DYNFLAGS +=     $(ZINTERPOSE)
 LDLIBS +=       -lc

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 #
--- a/usr/src/lib/libc_db/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libc_db/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libc_db.a
 VERS = .1
@@ -47,6 +48,9 @@
 CERRWARN +=	-Wno-type-limits
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libcfgadm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libcfgadm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libcfgadm.a
 VERS =		.1
@@ -37,6 +38,8 @@
 CERRWARN +=	-Wno-type-limits
 CERRWARN +=	-Wno-unused-label

+SMOFF += snprintf_overflow
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libcpc/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libcpc/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libcpc.a
 VERS	= .1
@@ -46,6 +47,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libcryptoutil/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libcryptoutil/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libcryptoutil.a
 VERS=	.1
@@ -51,6 +52,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 all: $(LIBS)

 include $(SRC)/lib/Makefile.targ
--- a/usr/src/lib/libcustr/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libcustr/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -26,6 +26,9 @@
 clobber :=	TARGET= clobber
 install :=	TARGET= install

+# needs work
+SMOFF=all_func_returns
+
 .KEEP_STATE:

 all clean clobber install: $(SUBDIRS)
--- a/usr/src/lib/libdevinfo/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdevinfo/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libdevinfo.a
 VERS=		.1
@@ -41,6 +42,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libdhcpagent/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdhcpagent/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY	=	libdhcpagent.a
 VERS =		.1
@@ -40,6 +41,9 @@

 CERRWARN +=	-Wno-type-limits

+# needs work
+SMOFF += allocating_enough_data
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libdhcputil/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdhcputil/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libdhcputil.a
 VERS =		.1
@@ -46,6 +47,9 @@
 CERRWARN +=	-Wno-uninitialized
 CPPFLAGS +=	-I$(COMDIR)

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libdisasm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdisasm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -121,6 +121,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 CPPFLAGS_standalone = -DDIS_STANDALONE -I$(SRC)/cmd/mdb/common
 CPPFLAGS +=	-I$(COMDIR) $(CPPFLAGS_$(CURTYPE))
--- a/usr/src/lib/libdiskmgt/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdiskmgt/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright 2016 Nexenta Systems, Inc.
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libdiskmgt.a
 VERS =		.1
@@ -62,6 +62,9 @@
 CERRWARN +=	-Wno-uninitialized
 CPPFLAGS +=	-I$(SRC)/lib/libdiskmgt/common

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libdladm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdladm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY = libdladm.a
@@ -47,6 +48,9 @@
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I$(SRCTOP)/include

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:		$(LIBS)
--- a/usr/src/lib/libdns_sd/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdns_sd/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Use is subject to license terms.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libdns_sd.a
 VERS =		.1
@@ -41,6 +42,9 @@

 pics/dnssd_clientstub.o := CERRWARN +=	-Wno-unused-but-set-variable

+# not linted
+SMATCH=off
+
 .PARALLEL =     $(OBJECTS)
 .KEEP_STATE:
--- a/usr/src/lib/libdtrace/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libdtrace/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2011, 2016 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libdtrace.a
 VERS = .1
@@ -103,7 +104,7 @@

 include ../../Makefile.lib

-SRCS = $(LIBSRCS:%.c=../common/%.c) $(LIBISASRCS:%.c=../$(MACH)/%.c)
+SRCS = $(LIBSRCS:%.c=../common/%.c) $(LIBISASRCS:%.c=../$(MACH)/%.c)
 LIBS = $(DYNLIB)

 SRCDIR = ../common
@@ -132,6 +133,9 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-switch

+# not linted
+SMATCH=off
+
 YYCFLAGS =
 LDLIBS += -lgen -lproc -lrtld_db -lctf -lelf -lc
 DRTILDLIBS = $(LDLIBS.lib) -lc
--- a/usr/src/lib/libefi/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libefi/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libefi.a
 VERS =		.1
@@ -38,6 +39,8 @@
 LIBS =		$(DYNLIB)
 LDLIBS +=	-luuid -lsmbios -lc

+SMOFF += kmalloc_wrong_size
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libfdisk/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libfdisk/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libfdisk.a
 VERS= .1
@@ -47,6 +47,9 @@

 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libficl/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libficl/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -12,6 +12,7 @@
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=libficl-sys.a
 MAJOR = 4
@@ -40,6 +41,9 @@

 LDLIBS +=	-luuid -lz -lc -lm -lumem

+# not linted
+SMATCH=off
+
 HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficltokens.h ../ficllocal.h \
 	$(FICLDIR)/ficlplatform/unix.h $(PNGLITE)/pnglite.h
--- a/usr/src/lib/libfsmgt/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libfsmgt/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libfsmgt.a
 VERS =		.1
@@ -52,6 +53,9 @@
 CERRWARN	+= -Wno-parentheses
 CERRWARN	+= -Wno-uninitialized

+# not linted
+SMATCH=off
+
 CLOBBERFILES	+= $(SRCDIR)/nfs_sec.c
 CLOBBERFILES	+= $(SRCDIR)/replica.c
 CLOBBERFILES	+= $(SRCDIR)/sharetab.c
--- a/usr/src/lib/libgen/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libgen/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libgen.a
 VERS =		.1
@@ -44,6 +45,9 @@
 CERRWARN +=	-Wno-char-subscripts
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libgss/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libgss/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libgss.a
 VERS = .1
@@ -107,6 +108,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-empty-body

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libima/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libima/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libima.a
 VERS=		.1
@@ -43,6 +43,9 @@

 CERRWARN +=	-Wno-unused-variable

+# not linted
+SMATCH=off
+
 SRCDIR =	../common

 $(ROOTETC)/%:	../common/%
--- a/usr/src/lib/libinetsvc/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libinetsvc/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libinetsvc.a
 VERS =		.1
@@ -42,6 +43,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libinetutil/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libinetutil/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libinetutil.a
 VERS = 	  .1
@@ -46,6 +47,8 @@

 CERRWARN +=	-Wno-parentheses

+SMOFF += index_overflow
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libipadm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libipadm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
-#
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY = libipadm.a
@@ -44,6 +44,9 @@
 CERRWARN +=	-Wno-uninitialized
 CPPFLAGS +=	-I$(SRCDIR)

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:		$(LIBS)
--- a/usr/src/lib/libipsecutil/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libipsecutil/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -41,6 +41,8 @@
 CERRWARN +=	-Wno-unused-function
 CERRWARN +=	-Wno-uninitialized

+SMOFF += shift_to_zero
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libkmf/ber_der/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libkmf/ber_der/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libkmfberder.a
 VERS= .1
@@ -47,6 +48,9 @@

 CERRWARN	+=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:    $(LIBS)
--- a/usr/src/lib/libkmf/libkmf/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libkmf/libkmf/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -67,6 +67,9 @@
 CERRWARN	+=	-Wno-type-limits
 CERRWARN	+=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:    $(LIBS)
--- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for KMF Plugins
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	kmf_nss.a
 VERS=		.1
@@ -55,6 +54,9 @@
 CERRWARN	+=	-Wno-unused-value
 CERRWARN	+=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 LDLIBS32	+=	$(NSSLIBS)

 LIBS	=	$(DYNLIB)
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for KMF Plugins
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	kmf_openssl.a
 VERS=		.1
@@ -50,6 +49,9 @@
 CERRWARN	+=	-Wno-unused-value
 CERRWARN	+=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 PICS=	$(OBJECTS:%=pics/%)

 LDLIBS32 	+=	$(OPENSSLLIBS)
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for KMF Plugins
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	kmf_pkcs11.a
 VERS=		.1
@@ -53,6 +52,9 @@

 CERRWARN	+=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 PICS=	$(OBJECTS:%=pics/%)

 LDLIBS	+=	$(PKCS11LIBS)
--- a/usr/src/lib/libkvm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libkvm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libkvm.a
 VERS=		.1
@@ -43,6 +44,8 @@

 CERRWARN +=	-Wno-uninitialized

+SMOFF += signed
+
 CLOBBERFILES += test test.o

 .KEEP_STATE:
--- a/usr/src/lib/libldap5/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libldap5/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libldap.a
 VERS= .5
@@ -104,6 +105,9 @@
 CERRWARN +=	-Wno-unused-value
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsasl -lmd -lc

 .KEEP_STATE:
--- a/usr/src/lib/libmapid/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libmapid/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libmapid.a
 VERS	=	.1
@@ -55,6 +55,8 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+SMOFF += all_func_returns
+
 .KEEP_STATE:

 all:  $(LIBS)
--- a/usr/src/lib/libmd/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libmd/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2013 Saso Kiselkov. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBS =		$(DYNLIB)
@@ -40,3 +41,5 @@

 CPPFLAGS +=	-I$(SRCDIR)
 LDLIBS +=	-lc
+
+SMOFF += 64bit_shift
--- a/usr/src/lib/libnisdb/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libnisdb/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libnisdb.a
 VERS=	.2
@@ -162,6 +162,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-switch

+# not linted
+SMATCH=off
+
 # Extra includes, from yp, for yptol files.
 CPPFLAGS += -I$(SRC)/cmd/ypcmd
--- a/usr/src/lib/libnsl/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libnsl/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,8 @@

 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY= libnsl.a
--- a/usr/src/lib/libnwam/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libnwam/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libnwam.a
 VERS=		.1
@@ -52,6 +53,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:	$(LIBS)
--- a/usr/src/lib/libofmt/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libofmt/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -11,6 +11,7 @@

 #
 # Copyright 2017 Nexenta Systems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY=	libofmt.a
@@ -29,6 +30,8 @@
 $(LINTLIB)	:= SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc

+SMOFF += kmalloc_wrong_size
+
 .KEEP_STATE:

 all:		$(LIBS)
--- a/usr/src/lib/libpool/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libpool/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libpool.a
 VERS =		.1
@@ -49,6 +50,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libproc/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libproc/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
 # Copyright (c) 2013 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libproc.a
 VERS = .1
@@ -97,6 +98,9 @@
 CERRWARN +=	-Wno-type-limits
 CERRWARN +=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 # All interfaces are interposable, therefore don't allow direct binding to
 # libproc.  Disable libproc from directly binding to itself, but allow libperl
 # to directly bind to its dependencies (ie. map -Bdirect -> -zdirect).  Ensure
--- a/usr/src/lib/libraidcfg/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libraidcfg/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,8 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libraidcfg/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libraidcfg.a
 VERS =		.1
@@ -39,6 +38,9 @@

 CERRWARN +=	-Wno-type-limits

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libresolv/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libresolv/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libresolv.a
 VERS= .1
@@ -59,6 +60,9 @@
 CERRWARN += -Wno-parentheses
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
 ROOTDYNLIBS=	$(DYNLIB:%=$(ROOTLIBDIR)/%)

 .KEEP_STATE:
--- a/usr/src/lib/libresolv2/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libresolv2/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libresolv.a
 VERS= .2
@@ -32,16 +32,16 @@
 		gettimeofday.o	setenv.o	strerror.o	utimes.o \
 		mktemp.o	setitimer.o	strpbrk.o	writev.o

-DSTOBJS=	dst_api.o	support.o	hmac_link.o
+DSTOBJS=	dst_api.o	support.o	hmac_link.o

-# inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with
+# inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with
 # libnsl
 INETOBJS= 	inet_net_pton.o	inet_neta.o	inet_lnaof.o \
 		inet_netof.o 	nsap_addr.o	inet_makeaddr.o	\
 		inet_network.o	inet_net_ntop.o	inet_cidr_ntop.o \
 		inet_cidr_pton.o 		inet_data.o

-# build only the IRS objects that the ISC libbind's make would
+# build only the IRS objects that the ISC libbind's make would
 IRSTHROBJS=	gethostent_r.o	getnetent_r.o 	getnetgrent_r.o \
 		getprotoent_r.o	getservent_r.o
 IRSOBJS=	${IRSTHROBJS} \
@@ -102,10 +102,13 @@
 LOCFLAGS +=	-D_SYS_STREAM_H -DSVR4 -DSUNW_OPTIONS \
 		-I../include -I../../common/inc

-CPPFLAGS +=	$(LOCFLAGS)
+CPPFLAGS +=	$(LOCFLAGS)

 CERRWARN +=	-Wno-implicit-function-declaration

+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(ZNODELETE)

 LDLIBS +=	 -lc -lmd
--- a/usr/src/lib/librestart/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/librestart/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	librestart.a
 VERS =		.1
--- a/usr/src/lib/librsm/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/librsm/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,13 +22,14 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= librsm.a
 VERS= .2

 TEXT_DOMAIN=	SUNW_OST_OSLIB

-OBJECTS = rsmlib.o rsmgen.o rsmloopback.o
+OBJECTS = rsmlib.o rsmgen.o rsmloopback.o

 # include library definitions, do not change order of include and DYNLIB
 include ../../Makefile.lib
@@ -41,7 +42,7 @@
 DEBUG =
 $(NOT_RELEASE_BUILD)DEBUG = -DDEBUG

-# The COPTFLAG is used for optimization purposes.
+# The COPTFLAG is used for optimization purposes.
 # It is disabled for debug builds
 $(NOT_RELEASE_BUILD)COPTFLAG =
 $(NOT_RELEASE_BUILD)COPTFLAG64 =
@@ -51,6 +52,9 @@
 CERRWARN	+= -Wno-unused-variable
 CERRWARN	+= -Wno-parentheses

+# not linted
+SMATCH=off
+
 LDLIBS += -lc

 .KEEP_STATE:
--- a/usr/src/lib/librstp/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/librstp/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	librstp.a
 VERS =		.1
@@ -41,6 +42,9 @@

 CPPFLAGS +=	-I$(SRCDIR) -D__SUN__ -D__STP_INTERNAL__

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libsasl/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsasl/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libsasl.a
 VERS= .1
@@ -47,6 +46,9 @@

 CPPFLAGS +=	-I../include -I$(PLUGDIR)

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libsaveargs/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsaveargs/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 # The build process for libsaveargs is sightly different from that used by other
@@ -85,6 +86,9 @@
 CFLAGS64_standalone = $(STAND_FLAGS_64)
 CFLAGS64 += $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common)

+# not linted
+SMATCH=off
+
 DYNFLAGS +=     $(ZINTERPOSE)

 .KEEP_STATE:
--- a/usr/src/lib/libscf/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libscf/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libscf.a
 VERS =		.1
@@ -61,6 +62,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 MY_NATIVE_CPPFLAGS =\
 		-DNATIVE_BUILD $(DTEXTDOM) \
 		-I../inc -I$(COMDIR)
--- a/usr/src/lib/libsec/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsec/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libsec.a
 VERS= .1
@@ -49,6 +50,9 @@
 CERRWARN +=	-Wno-unused-label
 CERRWARN +=	-Wno-unused-variable

+# not linted
+SMATCH=off
+
 CLOBBERFILES += acl.output

 # install this library in the root filesystem
--- a/usr/src/lib/libshare/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libshare/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2016 by Delphix. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 LIBRARY =	libshare.a
 VERS =		.1
@@ -43,6 +44,10 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-switch
+
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(NFSLIB_DIR) \
 		-I$(ADJUNCT_PROTO)/usr/include/libxml2
--- a/usr/src/lib/libshare/autofs/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libshare/autofs/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libshare_autofs.a
 VERS =		.1
@@ -41,6 +41,9 @@
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lshare -lscf -lumem -lc -lxml2

+# not linted
+SMATCH=off
+
 #add nfs/lib directory as part of the include path
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-unused-variable
@@ -61,7 +64,7 @@

 $(ROOTLIBDIR):
 	$(INS.dir)
-
+
 $(ROOTLIBDIR64):
 	$(INS.dir)
--- a/usr/src/lib/libshare/nfs/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libshare/nfs/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libshare_nfs.a
 VERS =		.1
@@ -49,6 +50,9 @@
 CPPFLAGS +=	-I$(NFSLIB_DIR) \
 		-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libshare/smb/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libshare/smb/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libshare_smb.a
 VERS =		.1
@@ -48,6 +49,10 @@

 CERRWARN +=	-Wno-char-subscripts
 CERRWARN +=	-Wno-switch
+
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
   		-I$(SRCDIR)/../common
--- a/usr/src/lib/libsip/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsip/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,8 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libsip.a
 VERS    = .1
@@ -41,6 +40,9 @@

 CPPFLAGS +=	-DOS='"solaris"' -D__OS_solaris -DNDEBUG

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:		$(LIBS)
--- a/usr/src/lib/libsldap/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsldap/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libsldap.a
 VERS= .1
@@ -51,6 +52,9 @@
 CERRWARN +=	-Wno-switch
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libsmbfs/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsmbfs/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -26,6 +26,7 @@
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 #
 # lib/libsmbfs/Makefile.com
@@ -76,7 +77,7 @@
 	ui-sun.o \
 	utf_str.o

-OBJ_CMN= smbfs_ntacl.o
+OBJ_CMN= smbfs_ntacl.o

 OBJECTS= $(OBJ_LIB) $(OBJ_CMN)

@@ -99,6 +100,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-variable

+# not linted
+SMATCH=off
+
 CPPFLAGS += -D__EXTENSIONS__ -DMIA \
 	-I$(SRCDIR) -I.. -I../netsmb \
 	-I$(SRC)/uts/common \
--- a/usr/src/lib/libsmedia/plugins/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsmedia/plugins/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBS =		$(DYNLIB)

@@ -40,6 +39,9 @@

 SRCDIR =	../common

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 objs/%.o pics/%.o: ../common/%.c
--- a/usr/src/lib/libsqlite/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsqlite/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -3,6 +3,7 @@
 # Use is subject to license terms.
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 # Make the SO name unlikely to conflict with any other
@@ -97,6 +98,9 @@
 CERRWARN += -Wno-unused-function
 CERRWARN += -Wno-unused-label

+# not linted
+SMATCH=off
+
 MAPFILES = ../mapfile-sqlite

 # headers generated here
--- a/usr/src/lib/libstmf/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libstmf/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libstmf.a
 VERS= .1
@@ -42,6 +43,9 @@

 CERRWARN +=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libsun_ima/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsun_ima/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libsun_ima.a
 VERS =		.1
@@ -45,6 +45,9 @@

 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-DSOLARIS
 CPPFLAGS += -I$(SRCTOP)/include
--- a/usr/src/lib/libsysevent/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libsysevent/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libsysevent.a

@@ -41,6 +40,9 @@
 CPPFLAGS +=	-I..
 LDLIBS +=	-lnvpair -lc

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all : $(LIBS)
--- a/usr/src/lib/libtecla/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libtecla/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libtecla.a
 VERS=		.1
@@ -45,6 +46,9 @@

 CERRWARN +=	-Wno-type-limits

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:	$(LIBS)
--- a/usr/src/lib/libumem/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libumem/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2012, Joyent, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 #
@@ -130,6 +130,8 @@
 CERRWARN += -Wno-switch
 CERRWARN += -Wno-uninitialized

+SMOFF += deref_check
+
 # We need to rename some standard functions so we can easily implement them
 # in consumers.
 STAND_RENAMED_FUNCS= \
--- a/usr/src/lib/libvscan/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libvscan/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libvscan.a
 VERS= .1
@@ -41,6 +40,8 @@
 LDLIBS += -lc -lscf -lsecdb -lm
 CPPFLAGS += -I$(SRCDIR)

+SMOFF += signed
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/libwrap/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libwrap/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY =	libwrap.a
@@ -47,13 +48,16 @@
 CPPFLAGS +=	$(NETGROUP) $(TLI) $(ALWAYS_HOSTNAME) $(AUTH) \
 		$(STYLE) $(TABLES) $(DOT) $(BUGS) \
 		-DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
-		-I$(SRCDIR)
+		-I$(SRCDIR)

 CERRWARN +=	-Wno-return-type
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
@@ -90,7 +94,7 @@
 # module, which also gives hints on how to add your own extensions.
 # Uncomment the next definition to turn on the language extensions
 # (examples: allow, deny, banners, twist and spawn).
-#
+#
 STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.

 ###########################
@@ -118,7 +122,7 @@
 # with connections from non-UNIX PCs.  On some systems, remote username
 # lookups can trigger a kernel bug, causing loss of service. The README
 # file describes how to find out if your UNIX kernel has that problem.
-#
+#
 # Uncomment the following definition if the wrappers should always
 # attempt to get the remote user name. If this is not enabled you can
 # still do selective username lookups as documented in the hosts_access.5
@@ -147,7 +151,7 @@
 # hostname.  With selective hostname lookups, the client hostname
 # lookup is postponed until the name is required by an access control
 # rule or by a %letter expansion.
-#
+#
 # In order to perform selective hostname lookups, disable paranoid
 # mode (see previous section) and comment out the following definition.
--- a/usr/src/lib/libzfs/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libzfs/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright (c) 2011, 2017 by Delphix. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY= libzfs.a
@@ -74,6 +75,9 @@
 CPPFLAGS +=	$(INCS)
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG

+# not linted
+SMATCH=off
+
 SRCS=	$(OBJS_COMMON:%.o=$(SRCDIR)/%.c)	\
 	$(OBJS_SHARED:%.o=$(SRCTOP)/kernel/fs/zfs/common/%.c)
--- a/usr/src/lib/libzonestat/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libzonestat/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libzonestat.a
 VERS=		.1
@@ -36,6 +37,9 @@

 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:	$(LIBS)
--- a/usr/src/lib/libzpool/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/libzpool/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #

 LIBRARY= libzpool.a
@@ -76,6 +76,9 @@
 CERRWARN +=	-Wno-unused-function
 CERRWARN +=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/mpapi/libmpapi/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/mpapi/libmpapi/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libMPAPI.a
 VERS=		.1
@@ -45,6 +46,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 ROOTETC =	$(ROOT)/etc
 CONFDIR =	../common
 CONFFILE =	$(CONFDIR)/mpapi.conf
--- a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	libmpscsi_vhci.a
 VERS=		.1
@@ -65,6 +66,9 @@
 CPPFLAGS +=	-I$(SRCDIR) -D_POSIX_PTHREAD_SEMANTICS
 CPPFLAGS +=	-DBUILD_TIME='"Wed Sep 24 12:00:00 2008"'

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/lib/nsswitch/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/nsswitch/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 include		$(SRC)/lib/Makefile.lib

@@ -38,6 +39,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-address

+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc
 HSONAME =
--- a/usr/src/lib/pam_modules/authtok_check/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/pam_modules/authtok_check/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	pam_authtok_check.a
 VERS=		.1
@@ -34,6 +35,9 @@

 CERRWARN	+= -Wno-parentheses

+# not linted
+SMATCH=off
+
 all:	$(LIBS)
--- a/usr/src/lib/pam_modules/krb5/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/pam_modules/krb5/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	pam_krb5.a
 VERS=		.1
@@ -50,6 +49,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-unused-function

+# not linted
+SMATCH=off
+
 # module needs to be unloadable because the key destructor might be
 # called after dlclose()
 DYNFLAGS +=	$(ZNODELETE)
--- a/usr/src/lib/passwdutil/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/passwdutil/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY=	passwdutil.a
 VERS=		.1
@@ -43,7 +44,7 @@
 include	../../Makefile.lib

 #
-# Since our name doesn't start with "lib", Makefile.lib incorrectly
+# Since our name doesn't start with "lib", Makefile.lib incorrectly
 # calculates LIBNAME. Therefore, we set it here.
 #
 LIBNAME=	passwdutil
@@ -58,6 +59,8 @@
 CERRWARN	+= -Wno-uninitialized
 CERRWARN	+= -Wno-unused-label

+# not linted
+SMATCH=off

 .KEEP_STATE:
--- a/usr/src/lib/pkcs11/libpkcs11/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/pkcs11/libpkcs11/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libpkcs11.a
 VERS= .1
@@ -76,6 +77,9 @@
 CERRWARN +=	-Wno-unused-label
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all:	$(LIBS)
--- a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,7 @@
 # Copyright 2017 Jason King
 # Copyright (c) 2018, Joyent, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libsoftcrypto.a
 VERS =		.1
@@ -42,6 +43,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 AES_PSM_SRC =	$(AES_DIR)/$(MACH64)/aes_amd64.s \
 		$(AES_DIR)/$(MACH64)/aes_intel.s \
 		$(AES_DIR)/$(MACH64)/aeskey.c
--- a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libsoftcrypto.a
 VERS =		.1
@@ -34,6 +35,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 # Sources need to be redefined after Makefile.lib inclusion.
 SRCS =		$(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \
 		$(DES_SRC) $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \
--- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= pkcs11_kernel.a
 VERS= .1
@@ -86,6 +87,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-label

+# not linted
+SMATCH=off
+
 ROOTLIBDIR=     $(ROOT)/usr/lib/security
 ROOTLIBDIR64=   $(ROOT)/usr/lib/security/$(MACH64)
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -24,8 +24,7 @@
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2018, Joyent, Inc.
 #
-# lib/pkcs11/pkcs11_softtoken/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = pkcs11_softtoken.a
 VERS= .1
@@ -133,6 +132,9 @@
 CERRWARN +=	-Wno-unused-variable
 CERRWARN +=	-Wno-empty-body

+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(AESDIR) -I$(BLOWFISHDIR) -I$(ARCFOURDIR) -I$(DESDIR) \
 	    -I$(DHDIR) -I$(DSADIR) -I$(ECCDIR) -I$(SRC)/common/crypto \
 	    -I$(MPIDIR) -I$(RSADIR) -I$(RNGDIR) \
--- a/usr/src/lib/rpcsec_gss/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/rpcsec_gss/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= rpcsec.a
 VERS = .1
@@ -37,6 +38,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-parentheses

+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(ZIGNORE)
--- a/usr/src/lib/sasl_plugins/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/sasl_plugins/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.

 COMMONOBJS=	plugin_common.o
 OBJECTS=	$(PLUG_OBJS) $(COMMONOBJS)
@@ -32,6 +33,9 @@

 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 LIBS =		$(DYNLIB)
 SRCS=		$(PLUG_OBJS:%.o=../%.c) \
 		$(COMMONOBJS:%.o=$(SRC)/lib/libsasl/plugin/%.c)
--- a/usr/src/lib/scsi/libses/Makefile.defs	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/scsi/libses/Makefile.defs	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 SRCS = $(OBJECTS:%.o=../common/%.c)
 CSTD = $(CSTD_GNU99)
@@ -32,6 +33,8 @@
 CERRWARN += -Wno-uninitialized
 CERRWARN += -Wno-unused-label

+SMOFF += all_func_returns
+
 ROOTLIBDIR = $(ROOTSCSILIBDIR)
 ROOTLIBDIR64 = $(ROOTSCSILIBDIR)/$(MACH64)
--- a/usr/src/lib/scsi/libsmp/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/scsi/libsmp/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY = libsmp.a
 VERS = .1
@@ -43,6 +44,8 @@
 CERRWARN += -Wno-type-limits
 CERRWARN += -Wno-uninitialized

+SMOFF += all_func_returns
+
 LDLIBS += \
 	-lumem \
 	-lc
--- a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -23,9 +23,11 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2018, Joyent, Inc.

 MODULE =	uscsi
 SRCS =		uscsi.c

 include ../../Makefile.engine
+
+SMOFF += signed
--- a/usr/src/lib/smbsrv/libmlsvc/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/smbsrv/libmlsvc/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libmlsvc.a
 VERS =		.1
@@ -92,6 +93,10 @@
 CERRWARN += -Wno-unused-function
 CERRWARN += -Wno-uninitialized

+# not linted
+SMATCH=off
+
+
 SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)

 include ../../Makefile.targ
--- a/usr/src/lib/smbsrv/libsmb/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/smbsrv/libsmb/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libsmb.a
 VERS= .1
@@ -86,6 +87,9 @@
 CERRWARN +=	-Wno-char-subscripts
 CERRWARN +=	-Wno-switch

+# not linted
+SMATCH=off
+
 SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)	\
 	$(OBJS_SHARED:%.o=$(SRC)/common/smbsrv/%.c)
--- a/usr/src/lib/smbsrv/libsmbns/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/smbsrv/libsmbns/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -20,7 +20,8 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
-#
+#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY= libsmbns.a
 VERS= .1
@@ -55,5 +56,8 @@
 CERRWARN +=	-Wno-unused-function
 CERRWARN +=	-Wno-uninitialized

+# not linted
+SMATCH=off
+
 include ../../Makefile.targ
 include ../../../Makefile.targ
--- a/usr/src/lib/smhba/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/smhba/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.


 LIBRARY =	libSMHBAAPI.a
@@ -49,6 +50,8 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-unused-function

+SMOFF += indenting,all_func_returns
+
 LDLIBS +=	-lc

 $(ROOTETC)/%:	../common/%
--- a/usr/src/lib/sun_sas/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/sun_sas/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.

 LIBRARY =	libsun_sas.a
 VERS =		.1
@@ -80,6 +80,9 @@
 CERRWARN +=	-Wno-parentheses
 CERRWARN +=	-Wno-unused-value

+# not linted
+SMATCH=off
+
 LDLIBS		+= -ldevinfo
 LDLIBS		+= -lsysevent
 LDLIBS		+= -lnvpair
--- a/usr/src/lib/udapl/udapl_tavor/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/udapl/udapl_tavor/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -22,9 +22,10 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.

-LIBRARY=       	udapl_tavor.a
-VERS=          	.1
+LIBRARY=       	udapl_tavor.a
+VERS=          	.1

 LOCOBJS =	\
 	dapl_cno_create.o \
@@ -139,7 +140,7 @@

 SRCS = $(LOCOBJS:%.o=$(SRCDIR)/%.c) $(TAVOROBJS:%.o=$(TAVORSRCDIR)/%.c)

-CPPFLAGS +=	-I$(SRC)/lib/udapl/udapl_tavor/include
+CPPFLAGS +=	-I$(SRC)/lib/udapl/udapl_tavor/include
 CPPFLAGS +=	-I$(SRC)/lib/udapl/udapl_tavor/tavor
 CPPFLAGS +=	-I$(SRCTOP)/include/sys/ib/clients/daplt
 CPPFLAGS +=	-I$(SRCTOP)/include
@@ -149,6 +150,9 @@
 CERRWARN +=	-Wno-uninitialized
 CERRWARN +=	-Wno-switch

+# not linted
+SMATCH=off
+
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDAPL_DBG
 debug := COPTFLAG = -g
 debug := COPTFLAG64 = -g
--- a/usr/src/lib/watchmalloc/Makefile.com	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/lib/watchmalloc/Makefile.com	Sun May 19 22:05:19 2019 -0400
@@ -40,6 +40,9 @@

 CERRWARN += -Wno-unused-label

+# not linted
+SMATCH=off
+
 .KEEP_STATE:

 all: $(LIBS)
--- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * routines common to isoch receive and isoch transmit
  */
 #include <sys/stat.h>
@@ -573,10 +577,11 @@

 	nsegs = (cnt / fps) + 1;

-		seg = idx / fps;
-		for (;;) {
-			(void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0,
-			    icp->ic_framesz, type);
+	seg = idx / fps;
+
+	for (;;) {
+		(void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0,
+		    icp->ic_framesz, type);

 		--nsegs;
 		if (nsegs == 0)
--- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */


@@ -193,7 +193,7 @@
 	}

 #ifndef NPROBE
-		(void) tnf_mod_unload(&modlinkage);
+	(void) tnf_mod_unload(&modlinkage);
 #endif /* ! NPROBE */

 	ddi_soft_state_fini(&dcam_state_p);
--- a/usr/src/uts/common/io/aac/aac.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/aac/aac.c	Sun May 19 22:05:19 2019 -0400
@@ -3,6 +3,7 @@
  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
  * Copyright 2005-08 Adaptec, Inc.
  * Copyright (c) 2005-08 Adaptec Inc., Achim Leubner
  * Copyright (c) 2000 Michael Smith
@@ -7287,7 +7288,7 @@
 		if (bp == NULL) {
 			if ((bp = scsi_alloc_consistent_buf(&ap, NULL,
 			    buf_len, B_READ, NULL_FUNC, NULL)) == NULL)
-			return (AACERR);
+				return (AACERR);
 		}
 		if ((pkt = scsi_init_pkt(&ap, NULL, bp, CDB_GROUP5,
 		    sizeof (struct scsi_arq_status), 0, PKT_CONSISTENT,
--- a/usr/src/uts/common/io/cryptmod.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/cryptmod.c	Sun May 19 22:05:19 2019 -0400
@@ -2,6 +2,8 @@
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
+ * Copyright (c) 2018, Joyent, Inc.
+ *
  * STREAMS Crypto Module
  *
  * This module is used to facilitate Kerberos encryption
@@ -3002,7 +3004,7 @@
 		if (cbp == NULL) {
 			cmn_err(CE_WARN,
 				"allocb (%d bytes) failed", sz);
-				return (NULL);
+			return (NULL);
 		}

 		cbp->b_cont = mp->b_cont;
--- a/usr/src/uts/common/io/dld/dld_proto.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/dld/dld_proto.c	Sun May 19 22:05:19 2019 -0400
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012, Nexenta Systems, Inc. All rights reserved.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*
@@ -817,7 +817,7 @@
 	mac_perim_exit(mph);

 	if (err != 0) {
-	switch (err) {
+		switch (err) {
 		case EINVAL:
 			dl_err = DL_BADADDR;
 			err = 0;
--- a/usr/src/uts/common/io/fd.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/fd.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,9 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */

 /*
  * Floppy Disk driver
@@ -1769,7 +1772,7 @@
 		if (rval != 0)
 			break;

-	if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) {
+		if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) {
 			auto struct iovec aiov;
 			auto struct uio auio;
 			struct uio *uio = &auio;
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,10 @@
 /* Copyright © 2003-2011 Emulex. All rights reserved.  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Source file containing the implementation of the driver entry points
  * and related helper functions
  */
@@ -210,7 +214,7 @@
 		ret = oce_set_multicast_table(dev, dev->if_id,
 		    &mca_hw_list[0], new_mcnt, B_FALSE);
 	}
-		if (ret != 0) {
+	if (ret != 0) {
 		oce_log(dev, CE_WARN, MOD_CONFIG,
 		    "mcast %s fails", add ? "ADD" : "DEL");
 		DEV_UNLOCK(dev);
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c	Sun May 19 22:05:19 2019 -0400
@@ -21,6 +21,9 @@

 /* Copyright © 2003-2011 Emulex. All rights reserved.  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */

 /*
  * Source file containing the implementation of MBOX
@@ -156,7 +159,7 @@
 		if (mbox_db.bits.ready) {
 			return (0);
 		}
-			drv_usecwait(5);
+		drv_usecwait(5);
 	}

 	return (ETIMEDOUT);
--- a/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,10 @@
  * Copyright 2010 QLogic Corporation. All rights reserved.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <qlge.h>
 #include <sys/atomic.h>
 #include <sys/strsubr.h>
@@ -2400,7 +2404,7 @@
 	/* Not TCP or UDP packet? nothing more to do */
 	if (((net_rsp->flags2 & IB_MAC_IOCB_RSP_T) == 0) &&
 	    ((net_rsp->flags2 & IB_MAC_IOCB_RSP_U) == 0))
-	return;
+		return;

 	/* No CKO support for IPv6 */
 	if ((net_rsp->flags3 & IB_MAC_IOCB_RSP_V6) != 0)
--- a/usr/src/uts/common/io/ib/clients/rds/rdsddi.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/ib/clients/rds/rdsddi.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/modctl.h>
@@ -832,7 +836,7 @@
 			/* Detect valid T_UNITDATA_REQ here */
 			if (((union T_primitives *)(uintptr_t)rptr)->type
 			    == T_UNITDATA_REQ)
-			break;
+				break;
 		}
 		/* FALLTHRU */
 	default:
--- a/usr/src/uts/common/io/ib/ibnex/ibnex.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/ib/ibnex/ibnex.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,10 @@
  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * The InfiniBand  Nexus driver (IB nexus) is a bus nexus driver for IB bus.
  * It supports  Port nodes, Virtual Physical Point of Attachment nodes (VPPA)
  * for  HCAs registered with IBTL and IOC nodes for all the IOCs present in
@@ -2863,7 +2867,7 @@
 				IBTF_DPRINTF_L2("ibnex", "\tcomm_svc_init : "
 				    "Service name %s invalid : Not unique",
 				    servicep[count]);
-					continue;
+				continue;
 			}

 		valid[count] = 1;
--- a/usr/src/uts/common/io/ntxn/unm_gem.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/ntxn/unm_gem.c	Sun May 19 22:05:19 2019 -0400
@@ -26,6 +26,11 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -1355,7 +1360,7 @@
 	unm_adapter  *adapter = (unm_adapter *)ddi_get_driver_private(dip);

 	if (adapter == NULL)
-	return (DDI_FAILURE);
+		return (DDI_FAILURE);

 	switch (cmd) {
 	case DDI_DETACH:
--- a/usr/src/uts/common/io/ntxn/unm_nic_hw.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/ntxn/unm_nic_hw.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -1859,10 +1863,10 @@
 			break;
 	}

-if (!ret)
-	adapter->promisc = 1;
+	if (!ret)
+		adapter->promisc = 1;

-		return (ret);
+	return (ret);
 }

 int
--- a/usr/src/uts/common/io/ntxn/unm_nic_init.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/ntxn/unm_nic_init.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -67,56 +71,56 @@
 static void
 crb_addr_transform_setup(void)
 {
-		crb_addr_transform(XDMA);
-		crb_addr_transform(TIMR);
-		crb_addr_transform(SRE);
-		crb_addr_transform(SQN3);
-		crb_addr_transform(SQN2);
-		crb_addr_transform(SQN1);
-		crb_addr_transform(SQN0);
-		crb_addr_transform(SQS3);
-		crb_addr_transform(SQS2);
-		crb_addr_transform(SQS1);
-		crb_addr_transform(SQS0);
-		crb_addr_transform(RPMX7);
-		crb_addr_transform(RPMX6);
-		crb_addr_transform(RPMX5);
-		crb_addr_transform(RPMX4);
-		crb_addr_transform(RPMX3);
-		crb_addr_transform(RPMX2);
-		crb_addr_transform(RPMX1);
-		crb_addr_transform(RPMX0);
-		crb_addr_transform(ROMUSB);
-		crb_addr_transform(SN);
-		crb_addr_transform(QMN);
-		crb_addr_transform(QMS);
-		crb_addr_transform(PGNI);
-		crb_addr_transform(PGND);
-		crb_addr_transform(PGN3);
-		crb_addr_transform(PGN2);
-		crb_addr_transform(PGN1);
-		crb_addr_transform(PGN0);
-		crb_addr_transform(PGSI);
-		crb_addr_transform(PGSD);
-		crb_addr_transform(PGS3);
-		crb_addr_transform(PGS2);
-		crb_addr_transform(PGS1);
-		crb_addr_transform(PGS0);
-		crb_addr_transform(PS);
-		crb_addr_transform(PH);
-		crb_addr_transform(NIU);
-		crb_addr_transform(I2Q);
-		crb_addr_transform(EG);
-		crb_addr_transform(MN);
-		crb_addr_transform(MS);
-		crb_addr_transform(CAS2);
-		crb_addr_transform(CAS1);
-		crb_addr_transform(CAS0);
-		crb_addr_transform(CAM);
-		crb_addr_transform(C2C1);
-		crb_addr_transform(C2C0);
-		crb_addr_transform(SMB);
-		crb_addr_transform(OCM0);
+	crb_addr_transform(XDMA);
+	crb_addr_transform(TIMR);
+	crb_addr_transform(SRE);
+	crb_addr_transform(SQN3);
+	crb_addr_transform(SQN2);
+	crb_addr_transform(SQN1);
+	crb_addr_transform(SQN0);
+	crb_addr_transform(SQS3);
+	crb_addr_transform(SQS2);
+	crb_addr_transform(SQS1);
+	crb_addr_transform(SQS0);
+	crb_addr_transform(RPMX7);
+	crb_addr_transform(RPMX6);
+	crb_addr_transform(RPMX5);
+	crb_addr_transform(RPMX4);
+	crb_addr_transform(RPMX3);
+	crb_addr_transform(RPMX2);
+	crb_addr_transform(RPMX1);
+	crb_addr_transform(RPMX0);
+	crb_addr_transform(ROMUSB);
+	crb_addr_transform(SN);
+	crb_addr_transform(QMN);
+	crb_addr_transform(QMS);
+	crb_addr_transform(PGNI);
+	crb_addr_transform(PGND);
+	crb_addr_transform(PGN3);
+	crb_addr_transform(PGN2);
+	crb_addr_transform(PGN1);
+	crb_addr_transform(PGN0);
+	crb_addr_transform(PGSI);
+	crb_addr_transform(PGSD);
+	crb_addr_transform(PGS3);
+	crb_addr_transform(PGS2);
+	crb_addr_transform(PGS1);
+	crb_addr_transform(PGS0);
+	crb_addr_transform(PS);
+	crb_addr_transform(PH);
+	crb_addr_transform(NIU);
+	crb_addr_transform(I2Q);
+	crb_addr_transform(EG);
+	crb_addr_transform(MN);
+	crb_addr_transform(MS);
+	crb_addr_transform(CAS2);
+	crb_addr_transform(CAS1);
+	crb_addr_transform(CAS0);
+	crb_addr_transform(CAM);
+	crb_addr_transform(C2C1);
+	crb_addr_transform(C2C0);
+	crb_addr_transform(SMB);
+	crb_addr_transform(OCM0);

 	/*
 	 * Used only in P3 just define it for P2 also.
--- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  * Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
  * Copyright (c) 2014, Tegile Systems Inc. All rights reserved.
  */
@@ -11883,7 +11883,7 @@
 		mptsas_log(mpt, CE_WARN, "Check of DMA handle failed in "
 		    "mptsas_diag_register.");
 		ddi_fm_service_impact(mpt->m_dip, DDI_SERVICE_UNAFFECTED);
-			status = DDI_FAILURE;
+		status = DDI_FAILURE;
 	}

 	/*
--- a/usr/src/uts/common/io/skd/skd.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/skd/skd.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
 /*
  * Copyright 2013 STEC, Inc.  All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 #include	<sys/types.h>
@@ -4775,8 +4776,8 @@
 	}
 	progress |= SKD_REGS_MAPPED;

-		skdev->iomap_iobase = skdev->iobase;
-		skdev->iomap_handle = skdev->iobase_handle;
+	skdev->iomap_iobase = skdev->iobase;
+	skdev->iomap_handle = skdev->iobase_handle;

 	Dcmn_err(CE_NOTE, "%s: PCI iobase=%ph, iomap=%ph, regnum=%d, "
 	    "regsize=%ld", skdev->name, (void *)skdev->iobase,
--- a/usr/src/uts/common/io/tl.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/tl.c	Sun May 19 22:05:19 2019 -0400
@@ -25,7 +25,7 @@
 /*
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
- * Copyright 2015 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*
@@ -2978,7 +2978,7 @@
 		 */
 		(void) (STRLOG(TL_ID, tep->te_minor, 2, SL_TRACE,
 		    "tl_conn_req: qlen overflow connection refused"));
-			err = ECONNREFUSED;
+		err = ECONNREFUSED;
 	}

 	/*
--- a/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,9 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */

 #include <sys/usb/usba/usbai_version.h>
 #include <sys/usb/usba.h>
@@ -1641,11 +1644,11 @@
 			curr_ei->prev_coll = cache_ei;
 			cache_ei = curr_ei;

-				USB_DPRINTF_L3(PRINT_MASK_ALL,
-				    hparser_log_handle,
-				    "Start Collection:cache_ei = 0x%p,"
-				    " curr_ei = 0x%p",
-				    (void *)cache_ei, (void *)curr_ei);
+			USB_DPRINTF_L3(PRINT_MASK_ALL,
+			    hparser_log_handle,
+			    "Start Collection:cache_ei = 0x%p,"
+			    " curr_ei = 0x%p",
+			    (void *)cache_ei, (void *)curr_ei);

 			if (prev_ei == NULL) {
 				prev_ei = curr_ei;
--- a/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c	Sun May 19 22:05:19 2019 -0400
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 /*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -510,7 +514,7 @@
 		case 0x1:
 		/* Outbound tracking is unreliable on the Cintiq */
 			if (sc->sc_type->protocol == CINTIQ)
-			break;
+				break;

 		/* Tool motion */
 		/*FALLTHRU*/
--- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,9 @@
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */

 /*
  * USB video class driver (usbvc(7D))
@@ -1334,8 +1337,8 @@
 	case USB_DEV_ONLINE:
 		/* Deny the powerdown request if the device is busy */
 		if (usbvcp->usbvc_pm->usbvc_pm_busy != 0) {
-		USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle,
-		    "usbvc_pwrlvl0: usbvc_pm_busy");
+			USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle,
+			    "usbvc_pwrlvl0: usbvc_pm_busy");

 			return (USB_FAILURE);
 		}
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c	Sun May 19 22:05:19 2019 -0400
@@ -450,7 +450,7 @@
 			USB_DPRINTF_L2(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
 			    "ehci_allocate_pools: More than 1 cookie");

-		goto failure;
+			goto failure;
 		}
 	} else {
 		USB_DPRINTF_L4(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
--- a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c	Sun May 19 22:05:19 2019 -0400
@@ -22,6 +22,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*
@@ -1329,7 +1330,8 @@

 		while (td) {

-		next_td = ohci_td_iommu_to_cpu(ohcip, Get_TD(td->hctd_next_td));
+			next_td = ohci_td_iommu_to_cpu(ohcip,
+			    Get_TD(td->hctd_next_td));

 			/*
 			 * Insert valid interrupt TD back into ED's
--- a/usr/src/uts/common/io/usb/usba/hubdi.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/io/usb/usba/hubdi.c	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
  * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*
@@ -6799,7 +6799,7 @@
 			if (hubd->h_children_dips[port] == child_dip) {
 				usba_device_t *ud =
 				    hubd->h_usba_devices[port];
-					hubd->h_children_dips[port] = NULL;
+				hubd->h_children_dips[port] = NULL;
 				if (ud) {
 					mutex_exit(HUBD_MUTEX(hubd));
--- a/usr/src/uts/common/rpc/sec/authdesubr.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/rpc/sec/authdesubr.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,7 @@
  * Copyright 2014 Gary Mills
  * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2018, Joyent, Inc.
  */

 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -307,7 +308,7 @@
 					mp2 = mp2->b_cont;
 				}

-			freemsg(mp);
+				freemsg(mp);
 			}

 			thetime = (time_t)dummy;
--- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
  *
  * $Header:
@@ -277,9 +281,9 @@
 	NOT_NULL(cr);
 	IS_ALIGNED(cr);
 #ifdef DEBUG
-if (HASH(cache_key, uid) < 0) {
-	prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr);
-}
+	if (HASH(cache_key, uid) < 0) {
+		prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr);
+	}
 #endif

 	/*
--- a/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c	Sun May 19 22:05:19 2019 -0400
@@ -29,6 +29,10 @@
  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Generic x86 CPU Module
  *
  * This CPU module is used for generic x86 CPUs when Solaris has no other
@@ -256,11 +260,11 @@

 	cms_post_mpstartup(hdl);

-		/*
-		 * All cpu handles are initialized only once all cpus
-		 * are started, so we can begin polling post mp startup.
-		 */
-		gcpu_mca_poll_start(hdl);
+	/*
+	 * All cpu handles are initialized only once all cpus are started, so we
+	 * can begin polling post mp startup.
+	 */
+	gcpu_mca_poll_start(hdl);
 }

 const char *
--- a/usr/src/uts/i86pc/io/mp_platform_common.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/i86pc/io/mp_platform_common.c	Sun May 19 22:05:19 2019 -0400
@@ -22,7 +22,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Nexenta Systems, Inc.
  * Copyright (c) 2017 by Delphix. All rights reserved.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 /*
  * Copyright (c) 2010, Intel Corporation.
@@ -1380,14 +1380,14 @@
 			 * found or the root is reached.
 			 */
 			ipin = (child_devno + child_ipin) % PCI_INTD;
-				if (bridge_bus == 0 && apic_pci_bus_total == 1)
-					bridge_bus = (int)apic_single_pci_busid;
-				pci_irq = ((bridge_devno & 0x1f) << 2) |
-				    (ipin & 0x3);
-				if ((*intrp = apic_find_io_intr_w_busid(pci_irq,
-				    bridge_bus)) != NULL) {
-					return (pci_irq);
-				}
+			if (bridge_bus == 0 && apic_pci_bus_total == 1)
+				bridge_bus = (int)apic_single_pci_busid;
+			pci_irq = ((bridge_devno & 0x1f) << 2) |
+			    (ipin & 0x3);
+			if ((*intrp = apic_find_io_intr_w_busid(pci_irq,
+			    bridge_bus)) != NULL) {
+				return (pci_irq);
+			}
 			dip = dipp;
 			child_devno = bridge_devno;
 			child_ipin = ipin;
--- a/usr/src/uts/i86pc/io/mp_platform_misc.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/i86pc/io/mp_platform_misc.c	Sun May 19 22:05:19 2019 -0400
@@ -28,6 +28,10 @@
  */

 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * PSMI 1.1 extensions are supported only in 2.6 and later versions.
  * PSMI 1.2 extensions are supported only in 2.7 and later versions.
  * PSMI 1.3 and 1.4 extensions are supported in Solaris 10.
@@ -1897,8 +1901,8 @@
 	    (reps < apic_max_reps_clear_pending));

 #ifdef DEBUG
-		if (rdt_entry & AV_PENDING)
-			apic_intr_deliver_timeouts++;
+	if (rdt_entry & AV_PENDING)
+		apic_intr_deliver_timeouts++;
 #endif

 	/*
--- a/usr/src/uts/intel/io/dktp/disk/cmdk.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/intel/io/dktp/disk/cmdk.c	Sun May 19 22:05:19 2019 -0400
@@ -23,6 +23,10 @@
  * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/scsi/scsi.h>
 #include <sys/dktp/cm.h>
 #include <sys/dktp/quetypes.h>
@@ -823,7 +827,7 @@
 		case DDI_MODEL_NONE: {
 			if (ddi_copyout(rwcmdp, outaddr,
 			    sizeof (struct dadkio_rwcmd), flag))
-			return (EFAULT);
+				return (EFAULT);
 		}
 	}
 	return (0);
--- a/usr/src/uts/intel/io/drm/radeon_state.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/intel/io/drm/radeon_state.c	Sun May 19 22:05:19 2019 -0400
@@ -3,6 +3,10 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 /* radeon_state.c -- State support for Radeon -*- linux-c -*- */
 /*
  * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
@@ -32,8 +36,6 @@
  *    Kevin E. Martin <martin@valinux.com>
  */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "drmP.h"
 #include "drm.h"
 #include "drm_sarea.h"
@@ -2244,7 +2246,7 @@

 	if (DRM_COPY_FROM_USER(&depth_boxes, clear.depth_boxes,
 	    sarea_priv->nbox * sizeof (depth_boxes[0])))
-	return (EFAULT);
+		return (EFAULT);

 	radeon_cp_dispatch_clear(dev, &clear, depth_boxes);

@@ -2924,10 +2926,10 @@
 	int start = header.veclinear.addr_lo | (header.veclinear.addr_hi << 8);
 	RING_LOCALS;

-		if (!sz)
-			return (0);
-		if (sz * 4 > cmdbuf->bufsz)
-			return (EINVAL);
+	if (!sz)
+		return (0);
+	if (sz * 4 > cmdbuf->bufsz)
+		return (EINVAL);

 	BEGIN_RING(5 + sz);
 	OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0);
--- a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c	Sun May 19 20:15:38 2019 -0400
+++ b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c	Sun May 19 22:05:19 2019 -0400
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */

+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/nvpair.h>
@@ -82,8 +86,8 @@
 			continue;

 		kmem_free(inhm_mc_snapshot[i], inhm_mc_snapshotsz[i]);
-			inhm_mc_snapshot[i] = NULL;
-			inhm_mc_snapshotsz[i] = 0;
+		inhm_mc_snapshot[i] = NULL;
+		inhm_mc_snapshotsz[i] = 0;
 	}
 	inhm_mc_snapshotgen++;
 }