From owner-p4-projects@FreeBSD.ORG  Sat Nov 19 18:08:03 2005
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 E897416A421; Sat, 19 Nov 2005 18:08:02 +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 BF7B616A41F
	for <perforce@freebsd.org>; Sat, 19 Nov 2005 18:08:02 +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 7F26043D58
	for <perforce@freebsd.org>; Sat, 19 Nov 2005 18:08:02 +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 jAJI82el027799
	for <perforce@freebsd.org>; Sat, 19 Nov 2005 18:08:02 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 jAJI82OJ027796
	for perforce@freebsd.org; Sat, 19 Nov 2005 18:08:02 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 19 Nov 2005 18:08:02 GMT
Message-Id: <200511191808.jAJI82OJ027796@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 86967 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, 19 Nov 2005 18:08:03 -0000

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

Change 86967 by rwatson@rwatson_peppercorn on 2005/11/19 18:07:39

	Interate user space bsm_token.c into kern_bsm_token.c, adding it to
	the userspace openbsm -> kernel branch.  Minor white space tweaks.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#13 integrate

Differences ...

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

@@ -152,7 +152,6 @@
 
 	if (vni == NULL)
 		return (NULL);
-
 	GET_TOKEN_AREA(t, dptr, 29);
 	if (t == NULL)
 		return (NULL);
@@ -1216,7 +1215,7 @@
 token_t *
 #if defined(KERNEL) || defined(_KERNEL)
 au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod,
-	struct timeval tm)
+    struct timeval tm)
 #else
 au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod)
 #endif