--- a/usr/src/lib/libbsm/common/adt.xml	Mon Sep 14 18:53:07 2009 +0800
+++ b/usr/src/lib/libbsm/common/adt.xml	Mon Sep 14 05:55:29 2009 -0700
@@ -2213,6 +2213,11 @@
 	<msg id="AD_FTRACE_STOP">ftrace stop</msg>
     </msg_list>
 
+<!--
+      msg list for TPM errors that will be reported by tcsd(8).
+      This list must match the order of the TPM_E_* error codes defined
+      in /usr/include/tss/tpm_error.h (SUNWtss package)
+-->
     <msg_list id="tpm_e" header="0" start="4000" public="true">
 	<msg id="AUTHFAIL">Authentication failed</msg>
 	<msg id="BADINDEX">The index to a PCR, DIR or other register is incorrect</msg>
@@ -2317,6 +2322,7 @@
 	<msg id="NEEDS_SELFTEST">SelfTestFull has not been run</msg>
 	<msg id="DOING_SELFTEST">The TPM is currently executing a full selftest</msg>
 	<msg id="DEFEND_LOCK_RUNNING">TPM is defending against dictionary attacks</msg>
+	<msg id="NO_MSG"></msg>
 	<!-- End TPM failure codes -->
     </msg_list>
 </specification>

--- a/usr/src/lib/libbsm/common/adt_xlate.h	Mon Sep 14 18:53:07 2009 +0800
+++ b/usr/src/lib/libbsm/common/adt_xlate.h	Mon Sep 14 05:55:29 2009 -0700
@@ -80,12 +80,18 @@
 union union_of_events {
 	union adt_event_data	d0;
 };
+
+/*
+ * The order of the lists MUST match the order in
+ * struct msg_text adt_msg_text that is generated by
+ * auditxml in adt_xlate.c.
+ */
 enum adt_msg_list {
 	ADT_LIST_FAIL_PAM,
 	ADT_LIST_FAIL_VALUE,
 	ADT_LIST_LOGIN_TEXT,
-	ADT_LIST_UADMIN_FCN,
-	ADT_LIST_TPM_E};
+	ADT_LIST_TPM_E,
+	ADT_LIST_UADMIN_FCN};
 
 enum datatype {ADT_UNDEFINED = 0,
     ADT_DATE,