From 7a38c0bebc3357184955f1e85e519c3b81e9da85 Mon Sep 17 00:00:00 2001
From: tz204579 <none@none>
Date: Fri, 28 Sep 2007 00:01:58 -0700
Subject: 6578465 adt.xml fails to document the <title>, <program> and <see>
 tags. 6580703 bsmrecord -p passwd is wrong.

---
 usr/src/lib/libbsm/common/adt.xml | 26 +++++++++++++++++++++++---
 usr/src/lib/libbsm/common/adt.xsd |  1 -
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'usr/src/lib/libbsm/common')

diff --git a/usr/src/lib/libbsm/common/adt.xml b/usr/src/lib/libbsm/common/adt.xml
index b69dce26f8..cfe291eb8f 100644
--- a/usr/src/lib/libbsm/common/adt.xml
+++ b/usr/src/lib/libbsm/common/adt.xml
@@ -62,12 +62,28 @@ Use is subject to license terms.
 			  code is generated but neither Java nor JNI code is.
 			- included text is just a comment
 			Within an event block, the following tags are defined:
-			<entry>, <debug>, <altname>
+			<entry>, <debug>, <altname>, <title>, <program>, <see>
 
 	altname		defines the internal name of an audit record; if
 			omitted, the internal name is the same as the
 			external name.
 
+	title,		these tags are used by bsmrecord build to create
+	program,	audit_record_attr database from adt events.
+	see		Following example demonstrates their semantics:
+
+			bsmrecord -p passwd
+			passwd		<-   <title>
+			  program     various              See passwd(1)
+			  		^-   <program>		^-   <see>
+			  event ID    6163                 AUE_passwd
+			  class       lo                   (0x00001000)
+			      header
+			      subject
+			      [text]                       username...
+			      					^-   <comment>
+			      return
+
 	entry		defines the correspondence between the data
 			supplied by the caller and the token to be
 			output.
@@ -76,7 +92,7 @@ Use is subject to license terms.
 			  it is the list of names of data to be associated
 			  with one output token.  (See <external>, below)
 			Within an entry block, the following tags are defined:
-			<internal>, <external>, <debug>
+			<internal>, <external>, <debug>, <comment>
 
 	internal	defines the token to be generated.
 			- token is a name that must also be defined with
@@ -148,6 +164,10 @@ Use is subject to license terms.
 			If the type is an array, its length must be given
 			explicitly.
 
+	comment		Used by bsmrecord build to generate audit_record_attr.
+			Comment is explanation note printed with token type.
+			See example above for other tags related to bsmrecord.
+
 	token		Define allowed token names.
 			- id is the name of token; this name is used
 			as an <internal> id.
@@ -656,7 +676,7 @@ Use is subject to license terms.
 	<entry id="username">
 	    <internal token="text"/>
 	    <external opt="optional" type="char *"/>
-	    <comment>success/fail message</comment>
+	    <comment>username if different than caller</comment>
 	</entry>
 	<entry id="return">
 	    <internal token="return"/>
diff --git a/usr/src/lib/libbsm/common/adt.xsd b/usr/src/lib/libbsm/common/adt.xsd
index 3a30dfa0cf..265c893657 100644
--- a/usr/src/lib/libbsm/common/adt.xsd
+++ b/usr/src/lib/libbsm/common/adt.xsd
@@ -56,7 +56,6 @@ Use is subject to license terms.
 		<xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
 		<xs:element name="program" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 		<xs:element name="see" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-		<xs:element name="note" type="xs:string" minOccurs="0" maxOccurs="1"/>
 		<xs:element name="entry" type="entry_t" minOccurs="0" maxOccurs="unbounded"/>
 	</xs:sequence>
 	<xs:attribute name="id" type="xs:string" use="required"/>
-- 
cgit v1.2.3