PERFORCE change 154288 for review

[Robert Watson]

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

Change 154288 by rwatson at rwatson_cinnamon on 2008/12/07 19:51:17

	Bump OpenBSM BSM header version.
	
	Complete deprecation of TRAILER_PAD_MAGIC by replacing it with
	AUT_TRAILER_MAGIC and removing all references to the old Darwin
	constant.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/NEWS#16 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 edit
.. //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 edit
.. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/NEWS#16 (text+ko) ====

@@ -12,6 +12,8 @@
   after the exec args/env tokens.
 - Support for AUT_SOCKET_EX extended socket tokens, which describe a socket
   using a pair of IPv4/IPv6 and port tuples.
+- OpenBSM BSM file header version bumped for 1.1 release.
+- Deprecated Darwin constants, such as TRAILER_PAD_MAGIC, removed.
 
 OpenBSM 1.1 alpha 2
 
@@ -361,4 +363,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#15 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#16 $

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 (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#83 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 $
  */
 
 #include <sys/types.h>
@@ -1556,7 +1556,7 @@
 {
 	token_t *t;
 	u_char *dptr = NULL;
-	u_int16_t magic = TRAILER_PAD_MAGIC;
+	u_int16_t magic = AUT_TRAILER_MAGIC;
 
 	GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) +
 	    sizeof(u_int32_t));

==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#22 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 $
 .\"
 .Dd November 5, 2006
 .Dt AUDIT.LOG 5
@@ -140,7 +140,7 @@
 The
 .Dq trailer
 terminates a BSM audit record, and contains a magic number,
-.Dv TRAILER_PAD_MAGIC
+.Dv AUT_TRAILER_MAGIC
 and length that can be used to validate that the record was read properly.
 A
 .Dq trailer

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

@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#5 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
@@ -164,14 +164,11 @@
 #define	AUDIT_HEADER_VERSION_SOLARIS	2
 #define	AUDIT_HEADER_VERSION_TSOL25	3
 #define	AUDIT_HEADER_VERSION_TSOL	4
-#define	AUDIT_HEADER_VERSION_OPENBSM	10
+#define	AUDIT_HEADER_VERSION_OPENBSM10	10
+#define	AUDIT_HEADER_VERSION_OPENBSM11	11
+#define	AUDIT_HEADER_VERSION_OPENBSM	AUDIT_HEADER_VERSION_OPENBSM11
 
-/*
- * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we
- * split the difference, will remove the Apple define for the next release.
- */
 #define	AUT_TRAILER_MAGIC	0xb105
-#define	TRAILER_PAD_MAGIC	AUT_TRAILER_MAGIC
 
 /* BSM library calls */