From owner-p4-projects@FreeBSD.ORG  Sun Apr 24 16:47:18 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0320016A4D0; Sun, 24 Apr 2005 16:47:18 +0000 (GMT)
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 BCC0616A4CE
	for <perforce@freebsd.org>; Sun, 24 Apr 2005 16:47:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9647043D2D
	for <perforce@freebsd.org>; Sun, 24 Apr 2005 16:47:17 +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 j3OGlHFa000605
	for <perforce@freebsd.org>; Sun, 24 Apr 2005 16:47:17 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 j3OGlH5p000602
	for perforce@freebsd.org; Sun, 24 Apr 2005 16:47:17 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 24 Apr 2005 16:47:17 GMT
Message-Id: <200504241647.j3OGlH5p000602@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>
Subject: PERFORCE change 75895 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 24 Apr 2005 16:47:18 -0000

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

Change 75895 by rwatson@rwatson_paprika on 2005/04/24 16:46:18

	Rename libbsm_internal.h to audit_internal.h so that the kernel can
	also use it to assemble BSM records.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/Makefile#3 edit
.. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#1 branch
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#7 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#4 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/libbsm_internal.h#2 delete

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/Makefile#3 (text+ko) ====

@@ -3,6 +3,7 @@
 #
 
 INCS=	audit.h								\
+	audit_internal.h						\
 	audit_kernel.h							\
 	audit_kevents.h							\
 	audit_record.h							\

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#7 (text+ko) ====

@@ -31,14 +31,14 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 
+#include <bsm/audit_internal.h>
+
 #include <errno.h>
 #include <libbsm.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "libbsm_internal.h"
-
 /* array of used descriptors */
 static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; 
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#4 (text+ko) ====

@@ -40,10 +40,10 @@
 #include <pwd.h>
 #include <grp.h>
 
+#include <bsm/audit_internal.h>
+
 #include <libbsm.h>
 
-#include "libbsm_internal.h"
-
 #define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err)	\
 	do {\
 		if(bytesread + size > len) {\