PERFORCE change 100145 for review

[Robert Watson]

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

Change 100145 by rwatson at rwatson_zoo on 2006/06/27 14:24:50

	Integrate OpenBSM 1.0a7 from audit3 userspace to audit3 kernel.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 integrate
.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 integrate

Differences ...

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

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 $
  * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $
  */
 

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

@@ -30,13 +30,15 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 $
  * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
 #define _BSM_AUDIT_RECORD_H_
 
+#include <sys/time.h>			/* struct timeval */
+
 /*
  * Token type identifiers.
  */

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 (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/audit3/sys/security/audit/audit_bsm_token.c#17 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 $
  * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $
  */
 
@@ -618,12 +618,14 @@
 	token_t *t;
 	u_char *dptr = NULL;
 
-	if (tid->at_type == AU_IPv6)
-		GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 *
-		    sizeof(u_int32_t));
+	if (tid->at_type == AU_IPv4)
+		GET_TOKEN_AREA(t, dptr, sizeof(u_char) +
+		    10 * sizeof(u_int32_t));
+	else if (tid->at_type == AU_IPv6)
+		GET_TOKEN_AREA(t, dptr, sizeof(u_char) +
+		    13 * sizeof(u_int32_t));
 	else
-		GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 *
-		    sizeof(u_int32_t));
+		return (NULL);
 
 	ADD_U_CHAR(dptr, AUT_PROCESS32_EX);
 	ADD_U_INT32(dptr, auid);
@@ -953,12 +955,14 @@
 	token_t *t;
 	u_char *dptr = NULL;
 
-	if (tid->at_type == AU_IPv6)
+	if (tid->at_type == AU_IPv4)
+		GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 *
+		    sizeof(u_int32_t));
+	else if (tid->at_type == AU_IPv6)
 		GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 *
 		    sizeof(u_int32_t));
 	else
-		GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 *
-		    sizeof(u_int32_t));
+		return (NULL);
 
 	ADD_U_CHAR(dptr, AUT_SUBJECT32_EX);
 	ADD_U_INT32(dptr, auid);