PERFORCE change 90134 for review

[Wayne Salamon]

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

Change 90134 by wsalamon at 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.
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message