[illumos-gate merge]

commit ae5c3fb759f05e5de586c82b204aabe1e336b578
    13589 ccid: implicit conversion from 'atr_protocol_t' 'uccid_prot_t'
commit 8ad466288742ffe497149f668ec1c028def2c686
    13585 stmf: array subscript is above array bounds
commit 718fc4ac1dfcd860e967fb444c831507f97cd300
    13512 ksh's >; is not reliable with `-c'
commit 3be0d903330def6576e70a1a8a028f5828c9ea45
    13174 mac_prop_info_set_default_fec should be added to mac_prop_info(9F)
commit 25a9a7aaf35c7e4a2b5a57d3875af906147710d5
    13572 SMB Query FileFsVolumeInformation should allow truncation
commit 4d00d81bf82141f996e032f9c53e0e996a5f7204
    13501 smbutil view crashes in ndr_clnt_get_frags()
commit 7713a0580ffd38602449546f743c4eaccdeff06d
    13582 wsdiff does not like non-proto directories
commit e39a7b5b5afda54edb90e52709591832137db39f
    12849 ixgbe can do unnecessary allocations during tx
commit 3a51e5c06fdc66b1c3883ded28372f6ae8e9cedb
    13573 stop working around broken _msg makefiles and fix them
commit cd93bdd351ff6db57bb306f3135a27aff71919d0
    13535 snoop: multiply-defined symbols
commit f6e9c6bd978eaf32de099c7f4a16eb9d2f1e5ab1
    13541 powertop: symbol 'g_turbo_supported' is multiply-defined
commit f641a59486e69100969f92a7ec309574f76b238d
    13426 xpv_psm: symbol 'acpi_isop' is multiply-defined

7 files changed, 19 insertions, 7 deletions

diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile
index b4abc1bf76..d614a17db9 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile
@@ -71,3 +71,5 @@ $(POFILES):
 	$(RM) messages.po
 
 FRC:
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index 594a2c7ba7..df434327f4 100644
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -134,3 +134,4 @@ generic.po:
 FRC:
 
 include ../Makefile.targ
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libmlrpc/common/ndr_marshal.c b/usr/src/lib/libmlrpc/common/ndr_marshal.c
index 33345aa3dd..9f3c383b96 100644
--- a/usr/src/lib/libmlrpc/common/ndr_marshal.c
+++ b/usr/src/lib/libmlrpc/common/ndr_marshal.c
@@ -20,12 +20,13 @@
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2020 Tintri by DDN, Inc. All rights reserved.
+ * Copyright 2021 Tintri by DDN, Inc. All rights reserved.
  */
 
 #include <assert.h>
 #include <strings.h>
 #include <sys/param.h>
+#include <sys/debug.h>
 
 #include <libmlrpc.h>
 
@@ -419,6 +420,8 @@ ndr_decode_pac_hdr(ndr_stream_t *nds, ndr_pac_hdr_t *hdr)
 	return (NDR_DRC_PTYPE_RPCHDR(rc));
 }
 
+CTASSERT(sizeof (ndr_common_header_t) >= NDR_CMN_HDR_SIZE);
+
 /*
  * Decode an RPC fragment header.  Use ndr_decode_pdu_hdr() to process
  * the first fragment header then this function to process additional
@@ -432,7 +435,7 @@ ndr_decode_frag_hdr(ndr_stream_t *nds, ndr_common_header_t *hdr)
 	int byte_order;
 
 	pdu = (uint8_t *)nds->pdu_base_offset + nds->pdu_scan_offset;
-	bcopy(pdu, hdr, NDR_RSP_HDR_SIZE);
+	bcopy(pdu, hdr, NDR_CMN_HDR_SIZE);
 
 	/*
 	 * Swap non-byte fields if the PDU byte-order
diff --git a/usr/src/lib/libmlrpc/common/rpcpdu.ndl b/usr/src/lib/libmlrpc/common/rpcpdu.ndl
index fae76738da..f0bd9578e4 100644
--- a/usr/src/lib/libmlrpc/common/rpcpdu.ndl
+++ b/usr/src/lib/libmlrpc/common/rpcpdu.ndl
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2020 Tintri by DDN, Inc. All rights reserved.
+ * Copyright 2021 Tintri by DDN, Inc. All rights reserved.
  */
 
 #ifndef _RPCPDU_NDL_
@@ -557,9 +557,11 @@ struct ndr_request_hdr_with_object {
 
 /*
  * Convenient for response header sizing and multi-fragment responses.
- * We know the header is going to be 24 bytes.
+ * We know the header is going to be 24 bytes, and the 'common' part
+ * is 16 bytes.
  */
-#define NDR_RSP_HDR_SIZE			24
+#define	NDR_CMN_HDR_SIZE			16
+#define	NDR_RSP_HDR_SIZE			24
 
 
 /*
diff --git a/usr/src/lib/libslp/Makefile b/usr/src/lib/libslp/Makefile
index 2d7e391c32..8bc2c392a7 100644
--- a/usr/src/lib/libslp/Makefile
+++ b/usr/src/lib/libslp/Makefile
@@ -75,3 +75,5 @@ $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.plugin b/usr/src/lib/libsmedia/plugins/Makefile.plugin
index 331d8bfc9e..6f3ac8ab63 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.plugin
+++ b/usr/src/lib/libsmedia/plugins/Makefile.plugin
@@ -62,3 +62,5 @@ $(POFILE) : $(POFILE_SRCS)
 	$(SED) -e '/^domain/d' messages.po > $@
 	$(RM) messages.po
 
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libsmedia/plugins/blkdev/Makefile b/usr/src/lib/libsmedia/plugins/blkdev/Makefile
index 9ccef361bf..6ac0f363f5 100644
--- a/usr/src/lib/libsmedia/plugins/blkdev/Makefile
+++ b/usr/src/lib/libsmedia/plugins/blkdev/Makefile
@@ -21,9 +21,9 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
-# lib/libsmedia/plugins/bd/Makefile
 
 include		../../../Makefile.lib
 include		Makefile.targ
 include		../Makefile.plugin
+
+include $(SRC)/Makefile.msg.targ