From owner-p4-projects@FreeBSD.ORG  Sat Jan 21 14:00:54 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 616CF16A427; Sat, 21 Jan 2006 14:00:54 +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 22F5C16A422
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 14:00:54 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B250743D45
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 14:00:53 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0LE0r2g082775
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 14:00:53 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0LE0rIu082772
	for perforce@freebsd.org; Sat, 21 Jan 2006 14:00:53 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 21 Jan 2006 14:00:53 GMT
Message-Id: <200601211400.k0LE0rIu082772@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90080 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 14:00:55 -0000

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

Change 90080 by rwatson@rwatson_sesame on 2006/01/21 14:00:15

	Fix count of u_chars in one case.
	
	White space synchronization to OpenBSM.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#5 (text+ko) ====

@@ -81,7 +81,7 @@
 	textlen = strlen(text);
 	textlen += 1;
 
-	GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(u_char) +
+	GET_TOKEN_AREA(t, dptr, 2 * sizeof(u_char) + 2 * sizeof(u_char) +
 	    sizeof(u_int32_t) + sizeof(u_int16_t) + textlen);
 
 	ADD_U_CHAR(dptr, AUT_ARG32);
@@ -1031,7 +1031,7 @@
 	}
 
 	totlen += count * sizeof(char);	/* nul terminations. */
-	GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t)  + totlen);
+	GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + totlen);
 
 	ADD_U_CHAR(dptr, AUT_EXEC_ARGS);
 	ADD_U_INT32(dptr, count);