PERFORCE change 92473 for review

[Robert Watson]

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

Change 92473 by rwatson at rwatson_fledge on 2006/02/27 18:48:09

	Move contents of struct au_token from audit.h to audit_internal.h:
	this is internal to the libbsm implementation.  Leave token_t in
	the public header since it is a defined part of the interface.
	
	Move contents of struct au_record and definition of au_record_t
	into audit_internal.h for similar reasons.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 edit
.. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 $
  */
 
 #ifndef _BSM_AUDIT_H
@@ -240,25 +240,11 @@
 };
 typedef	struct auditpinfo_addr	auditpinfo_addr_t;
 
-/* Token and record structures. */
-
-struct au_token {
-	u_char			*t_data;
-	size_t			 len;
-	TAILQ_ENTRY(au_token)	 tokens;
-};
+/*
+ * Contents of token_t are opaque outside of libbsm.
+ */
 typedef	struct au_token	token_t;
 
-struct au_record {
-	char			 used;		/* Record currently in use? */
-	int			 desc;		/* Descriptor for record. */
-	TAILQ_HEAD(, au_token)	 token_q;	/* Queue of BSM tokens. */
-	u_char			*data;
-	size_t			 len;
-	LIST_ENTRY(au_record)	 au_rec_q;
-};
-typedef	struct au_record	au_record_t;
-
 /*
  * Kernel audit queue control parameters.
  */
@@ -310,6 +296,9 @@
 };
 typedef	struct au_evclass_map	au_evclass_map_t;
 
+/*
+ * Audit system calls.
+ */
 #if !defined(_KERNEL) && !defined(KERNEL)
 int	audit(const void *, int);
 int	auditon(int, void *, int);

==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 (text+ko) ====

@@ -34,7 +34,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 $
  */
 
 #ifndef _LIBBSM_INTERNAL_H
@@ -47,6 +47,22 @@
  * broken with future releases of OpenBSM, which may delete, modify, or
  * otherwise break these interfaces or the assumptions they rely on.
  */
+struct au_token {
+	u_char			*t_data;
+	size_t			 len;
+	TAILQ_ENTRY(au_token)	 tokens;
+};
+
+struct au_record {
+	char			 used;		/* Record currently in use? */
+	int			 desc;		/* Descriptor for record. */
+	TAILQ_HEAD(, au_token)	 token_q;	/* Queue of BSM tokens. */
+	u_char			*data;
+	size_t			 len;
+	LIST_ENTRY(au_record)	 au_rec_q;
+};
+typedef	struct au_record	au_record_t;
+
 
 /* We could determined the header and trailer sizes by
  * defining appropriate structures. We hold off that approach