From owner-svn-src-head@FreeBSD.ORG  Wed Dec 31 13:56:32 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28335106568B;
	Wed, 31 Dec 2008 13:56:32 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 149118FC16;
	Wed, 31 Dec 2008 13:56:32 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBVDuVGR027396;
	Wed, 31 Dec 2008 13:56:31 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBVDuVHE027394;
	Wed, 31 Dec 2008 13:56:31 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200812311356.mBVDuVHE027394@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 31 Dec 2008 13:56:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186650 - in head/sys: conf security/audit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Dec 2008 13:56:32 -0000

Author: rwatson
Date: Wed Dec 31 13:56:31 2008
New Revision: 186650
URL: http://svn.freebsd.org/changeset/base/186650

Log:
  Commit two files missed in previous commit: hook up audit_bsm_errno.c
  and adapt for kernel build environment.
  
  Obtained from:	TrustedBSD Project
  Sponsored by:	Apple, Inc.

Modified:
  head/sys/conf/files
  head/sys/security/audit/audit_bsm_errno.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Wed Dec 31 11:56:35 2008	(r186649)
+++ head/sys/conf/files	Wed Dec 31 13:56:31 2008	(r186650)
@@ -2534,6 +2534,7 @@ rpc/rpcsec_gss/svc_rpcsec_gss.c	optional
 security/audit/audit.c		optional audit
 security/audit/audit_arg.c	optional audit
 security/audit/audit_bsm.c	optional audit
+security/audit/audit_bsm_errno.c	optional audit
 security/audit/audit_bsm_klib.c	optional audit
 security/audit/audit_bsm_token.c	optional audit
 security/audit/audit_pipe.c	optional audit

Modified: head/sys/security/audit/audit_bsm_errno.c
==============================================================================
--- head/sys/security/audit/audit_bsm_errno.c	Wed Dec 31 11:56:35 2008	(r186649)
+++ head/sys/security/audit/audit_bsm_errno.c	Wed Dec 31 13:56:31 2008	(r186650)
@@ -32,10 +32,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
+
+#include <security/audit/audit.h>
 
 #include <bsm/audit_errno.h>
-#include <bsm/libbsm.h>
+#include <bsm/audit_record.h>
 
 #include <sys/errno.h>