PERFORCE change 104828 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=104828

Change 104828 by rwatson at rwatson_sesame on 2006/08/23 06:14:44

	Rename more OpenBSM-specific constants from BSM_ to AUDIT_, including
	the header version identifiers, and maximum groups/args/env values.
	
	Suggested by:	Martin Englund <Martin dot Englund at Sun dot COM>

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 edit
.. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
@@ -199,7 +199,7 @@
 #define PAD_NOTATTR  0x4000   /* nonattributable event */
 #define PAD_FAILURE  0x8000   /* fail audit event */
 
-#define BSM_MAX_GROUPS      16
+#define AUDIT_MAX_GROUPS      16
 
 /*
  * A number of BSM versions are floating around and defined.  Here are
@@ -207,11 +207,11 @@
  * Solaris BSM version, but has a separate version number in order to
  * identify a potentially different event identifier name space.
  */
-#define	BSM_HEADER_VERSION_OLDDARWIN	1	/* In retrospect, a mistake. */
-#define	BSM_HEADER_VERSION_SOLARIS	2
-#define	BSM_HEADER_VERSION_TSOL25	3
-#define	BSM_HEADER_VERSION_TSOL		4
-#define	BSM_HEADER_VERSION_OPENBSM	10
+#define	AUDIT_HEADER_VERSION_OLDDARWIN	1	/* In retrospect, a mistake. */
+#define	AUDIT_HEADER_VERSION_SOLARIS	2
+#define	AUDIT_HEADER_VERSION_TSOL25	3
+#define	AUDIT_HEADER_VERSION_TSOL	4
+#define	AUDIT_HEADER_VERSION_OPENBSM	10
 
 /*
  * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we

==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 $
  */
 
 #ifndef _LIBBSM_H_
@@ -37,8 +37,8 @@
  * solely to allow OpenSSH to compile; Darwin/Apple code should not use them.
  */
 
-#define	BSM_MAX_ARGS	10
-#define	BSM_MAX_ENV	10
+#define	AUDIT_MAX_ARGS	10
+#define	AUDIT_MAX_ENV	10
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
@@ -218,7 +218,7 @@
  */
 typedef struct {
 	u_int32_t	 count;
-	char		*text[BSM_MAX_ARGS];
+	char		*text[AUDIT_MAX_ARGS];
 } au_execarg_t;
 
 /*
@@ -227,7 +227,7 @@
  */
 typedef struct {
 	u_int32_t	 count;
-	char		*text[BSM_MAX_ENV];
+	char		*text[AUDIT_MAX_ENV];
 } au_execenv_t;
 
 /*
@@ -259,7 +259,7 @@
  */
 typedef struct {
 	u_int16_t	no;
-	u_int32_t	list[BSM_MAX_GROUPS];
+	u_int32_t	list[AUDIT_MAX_GROUPS];
 } au_groups_t;
 
 /*

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 $
  */
 
 #include <sys/types.h>
@@ -309,7 +309,7 @@
 au_to_groups(int *groups)
 {
 
-	return (au_to_newgroups(BSM_MAX_GROUPS, groups));
+	return (au_to_newgroups(AUDIT_MAX_GROUPS, groups));
 }
 
 /*
@@ -1155,7 +1155,7 @@
 
 	ADD_U_CHAR(dptr, AUT_HEADER32);
 	ADD_U_INT32(dptr, rec_size);
-	ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM);
+	ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM);
 	ADD_U_INT16(dptr, e_type);
 	ADD_U_INT16(dptr, e_mod);