[illumos-gate merge]

commit ce8560eeb961d528e27685fcdd2ffb03e9478dbf
    13169 CVE-2020-1472 (ZeroLogon) and SMB authentication
commit 9e3ab9e9117808af4e738ea3ac45888be11e4045
    13442 SMB server should try harder to protect SACLs
commit 0a73e6f973645e207d33a7012fed997991b4e531
    13441 SMB: Creating named streams on existing files is not quite right
commit b30d193948be5a7794d7ae3ba0ed9c2f72c88e0f
    13405 ksh93 update to 2012-08-01
    13434 sh: mishandles backslash as last character of a block of input
    11750 ksh mkdir builtin doesn't honor special file permissions
    9199 ksh93 builtin *grep -v mishandles blank lines, blows up libgcrypt-config
    6756 sh (and ksh) have issues with ${1+"$@"}
    6520 ksh: sleep could wait forever
    4860 ksh93: core in printf
    3791 /bin/sh's builtin 'rm' busted: 'rm -f' without arguments returns error
    1047 ksh overwrites child core files
    880 ksh93 coredumps on 'unset'
    499 "interrupted system call" when using "tee" builtin in ksh
commit df36e06d12cbf655ddf22339ef8c39fa2b83ebf8
    13334 Recognize X710 10GBaseT*L Family
commit 43449cdcd0600512dd862537f2cf014140dd0844
    13468 Update Intel perfmon data to Jan 2021

5 files changed, 14 insertions, 7 deletions

diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime
index 27374a9369..51820bd7ff 100644
--- a/exception_lists/check_rtime
+++ b/exception_lists/check_rtime
@@ -23,7 +23,7 @@
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2018 Joyent, Inc.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2019 Peter Tribble.
 # Copyright 2018 Joyent, Inc.
 # Copyright 2020 Oxide Computer Company
@@ -44,7 +44,6 @@
 #	lib/amd64
 #	lib/sparcv9
 
-
 # Directory hierarchies to skip completely
 SKIP		^usr/lib/libc/			# optimized libc
 SKIP		^usr/lib/rcm/			# 4426119
@@ -108,6 +107,13 @@ UNUSED_DEPS	^usr/lib/picl/plugins/		# require devtree dependencies
 UNUSED_OBJ	unused object=.*/libnetsnmphelpers\.so\..*
 UNREF_OBJ	unreferenced object=.*/libnetsnmphelpers\.so\..*
 
+# ksh93 is just a wrapper into libshell but it is linked with libumem.so
+# so that the underlying libraries use that implementation for memory
+# management. Since ksh itself doesn't perform any memory allocations in
+# the stub, ldd -U determines that libumem is an unreferenced object.
+UNREF_OBJ	/libumem\.so\.1.*/usr/bin/(i86|amd64)/r?ksh(93)?\b
+UNREF_OBJ	/libumem\.so\.1.*/usr/bin/sparcv[79]/r?ksh(93)?\b
+
 # Unused runpaths due to dlopen() use
 UNUSED_RPATH	/usr/lib/fs/autofs.*\ from\ .automountd
 UNUSED_RPATH	/etc/ppp/plugins.*\ from\ .*pppd
diff --git a/exception_lists/copyright b/exception_lists/copyright
index 96106858c5..ef5530ac1d 100644
--- a/exception_lists/copyright
+++ b/exception_lists/copyright
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2020 Tintri by DDN, Inc. All rights reserved.
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2011 by Delphix. All rights reserved.
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
@@ -402,10 +402,8 @@ usr/src/lib/krb5/ss/mit-sipb-copyright.h
 usr/src/lib/krb5/ss/options.c
 usr/src/lib/krb5/ss/std_rqs.c
 usr/src/lib/krb5/ss/utils.c
-usr/src/lib/libast/common/tm/tvsleep.c
 usr/src/lib/librstp/common/*.[ch]
 usr/src/lib/librstp/common/[CRT]*
-usr/src/lib/libshell/common/bltins/sleep.c
 # these have copyrights that the nit checker doesn't grok
 usr/src/lib/libsmbfs/netsmb/spnego.h
 usr/src/lib/libsmbfs/smb/derparse.[ch]
@@ -413,6 +411,7 @@ usr/src/lib/libsmbfs/smb/spnego.c
 usr/src/lib/libsmbfs/smb/spnegoparse.[ch]
 usr/src/test/crypto-tests/tests/digest/data/*.rsp
 usr/src/test/crypto-tests/tests/digest/data/README
+usr/src/test/libmlrpc-tests/tests/netrlogon/krb5_pac_tests/krb5_pac.bin
 usr/src/test/util-tests/tests/dis/*/*.out
 usr/src/test/util-tests/tests/libsff/*.out
 usr/src/test/util-tests/tests/grep_xpg4/files/gout*
diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index 68a26baf1a..7b8917739f 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -18,6 +18,7 @@ usr/src/cmd/acpi/common/utmath.c
 usr/src/cmd/acpi/common/utnonansi.c
 usr/src/cmd/acpi/common/utprint.c
 usr/src/cmd/acpi/common/utxferror.c
+sr/src/cmd/ast/libshell/common/illumos_cmdlist.h
 usr/src/cmd/cxgbetool/*
 usr/src/cmd/hal/tools/hal_set_property.c
 usr/src/cmd/krb5/kadmin/cli/kadmin_ct.c
@@ -651,7 +652,6 @@ usr/src/lib/krb5/ss/ss_internal.h
 usr/src/lib/krb5/ss/ss.h
 usr/src/lib/krb5/ss/std_rqs.c
 usr/src/lib/krb5/ss/utils.c
-usr/src/lib/libast/common/tm/tvsleep.c
 usr/src/lib/libgss/g_glue.c
 usr/src/lib/libresolv2/common
 usr/src/lib/libresolv2_joy/common
@@ -694,7 +694,6 @@ usr/src/lib/librstp/common/transmit.h
 usr/src/lib/librstp/common/uid_stp.h
 usr/src/lib/librstp/common/vector.c
 usr/src/lib/librstp/common/vector.h
-usr/src/lib/libshell/common/bltins/sleep.c
 usr/src/lib/libsmbfs/smb/derparse.c
 usr/src/lib/libsmbfs/smb/derparse.h
 usr/src/lib/libsmbfs/smb/spnego.c
diff --git a/exception_lists/manlint b/exception_lists/manlint
index 88ff4ce84d..89be350691 100644
--- a/exception_lists/manlint
+++ b/exception_lists/manlint
@@ -27,3 +27,4 @@ usr/src/lib/libpool/dtd/rm_pool.dtd.1
 usr/src/lib/libzonecfg/dtd/zonecfg.dtd.1
 usr/src/test/util-tests/tests/grep_xpg4/files/*
 usr/src/tools/smatch/src/*
+usr/src/contrib/ast/*
diff --git a/exception_lists/wscheck b/exception_lists/wscheck
index 3f8b621031..2c0226f561 100644
--- a/exception_lists/wscheck
+++ b/exception_lists/wscheck
@@ -114,6 +114,8 @@ usr/src/uts/common/io/e1000api/*
 usr/src/uts/common/io/qede/*
 usr/src/uts/common/io/i40e/core/*
 usr/src/uts/common/io/ixgbe/core/*
+usr/src/contrib/ast/*
+usr/src/cmd/ast/libshell/misc/shell_styleguide.docbook
 usr/src/test/util-tests/tests/dis/i386/*.out
 
 # bhyve sources