From owner-p4-projects@FreeBSD.ORG  Wed May 26 20:23:28 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9884616A4D1; Wed, 26 May 2004 20:23:28 -0700 (PDT)
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 6D69C16A4CF
	for <perforce@freebsd.org>; Wed, 26 May 2004 20:23:28 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6662743D31
	for <perforce@freebsd.org>; Wed, 26 May 2004 20:23:28 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4R3MZLh051252
	for <perforce@freebsd.org>; Wed, 26 May 2004 20:22:35 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R3MZvl051247
	for perforce@freebsd.org; Wed, 26 May 2004 20:22:35 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 26 May 2004 20:22:35 -0700 (PDT)
Message-Id: <200405270322.i4R3MZvl051247@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 53581 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: Thu, 27 May 2004 03:23:29 -0000

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

Change 53581 by rwatson@rwatson_paprika on 2004/05/26 20:22:35

	Use FreeBSD directory layout to reach bsm include files.  We'll
	need to use the bsm layout for include files at some point,
	but this should get things going in the mean time.

Affected files ...

.. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/libbsm.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/contrib/bsm/lib/libbsm.h#2 (text+ko) ====

@@ -43,9 +43,11 @@
 #include <sys/queue.h>
 #include <sys/cdefs.h>		/* __{BEGIN,END}_DECLS */
 
-#include <bsm/audit.h>
-#include <bsm/audit_record.h>
+#include <sys/audit.h>
+#include <security/audit/audit_record.h>
+#ifdef DARWIN
 #include <mach/mach.h>		/* audit_token_t */
+#endif
 
 #define AU_PRS_SUCCESS  1
 #define AU_PRS_FAILURE  2