From owner-p4-projects@FreeBSD.ORG  Sat Jan 21 22:39:57 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A71AF16A422; Sat, 21 Jan 2006 22:39:56 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 685F116A41F
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 22:39:56 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1606543D53
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 22:39:56 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0LMdtNS029187
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 22:39:55 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0LMdtqr029184
	for perforce@freebsd.org; Sat, 21 Jan 2006 22:39:55 GMT
	(envelope-from wsalamon@computer.org)
Date: Sat, 21 Jan 2006 22:39:55 GMT
Message-Id: <200601212239.k0LMdtqr029184@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90134 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jan 2006 22:39:57 -0000

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

Change 90134 by wsalamon@gretsch on 2006/01/21 22:39:29

	Integrate recent changes from the OpenBSM branch, via contrib/openbsm,
	into the kernel headers.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_uevents.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/bsm/libbsm.h#1 branch

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#18 (text+ko) ====

@@ -41,7 +41,7 @@
 #define	AUDIT_RECORD_MAGIC	0x828a0f1b
 #define MAX_AUDIT_RECORDS	20
 #define MAX_AUDIT_RECORD_SIZE	4096
-#define MIN_AUDIT_FILE_SIZE	512 * 1024
+#define MIN_AUDIT_FILE_SIZE	(512 * 1024)
 
 /* The special device filename */
 #define AUDITDEV_FILENAME "audit"

==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#4 (text+ko) ====

@@ -63,33 +63,33 @@
  */
 #define	ADD_U_CHAR(loc, val)						\
 	do {								\
-		*loc = val;						\
-		loc += sizeof(u_char);					\
+		*(loc) = (val);						\
+		(loc) += sizeof(u_char);				\
 	} while(0)
 
 
 #define	ADD_U_INT16(loc, val)						\
 	do {								\
-		be16enc(loc, val);					\
-		loc += sizeof(u_int16_t);				\
+		be16enc((loc), (val));					\
+		(loc) += sizeof(u_int16_t);				\
 	} while(0)
 
 #define	ADD_U_INT32(loc, val)						\
 	do {								\
-		be32enc(loc, val);					\
-		loc += sizeof(u_int32_t);				\
+		be32enc((loc), (val));					\
+		(loc) += sizeof(u_int32_t);				\
 	} while(0)
 
 #define	ADD_U_INT64(loc, val)						\
 	do {								\
-		be64enc(loc, val);					\
-		loc += sizeof(u_int64_t); 				\
+		be64enc((loc), (val));					\
+		(loc) += sizeof(u_int64_t); 				\
 	} while(0)
 
 #define	ADD_MEM(loc, data, size)					\
 	do {								\
-		memcpy(loc, data, size);				\
-		loc += size;						\
+		memcpy((loc), (data), (size));				\
+		(loc) += size;						\
 	} while(0)
 
 #define	ADD_STRING(loc, data, size)	ADD_MEM(loc, data, size)

==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#13 (text+ko) ====

@@ -355,6 +355,7 @@
 #define	AUE_KQUEUE		377	/* FreeBSD */
 #define	AUE_KEVENT		378	/* FreeBSD */
 #define	AUE_FSYNC		379
+#define AUE_NMOUNT		380	/* FreeBSD */
 
 /*
  * XXXRW: Values not yet assigned.