From owner-p4-projects@FreeBSD.ORG  Sat Oct  1 23:20:21 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 7C66016A421; Sat,  1 Oct 2005 23:20:20 +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 1B3BF16A420
	for <perforce@freebsd.org>; Sat,  1 Oct 2005 23:20:20 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D008A43D49
	for <perforce@freebsd.org>; Sat,  1 Oct 2005 23:20:09 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j91NK9um002598
	for <perforce@freebsd.org>; Sat, 1 Oct 2005 23:20:09 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j91NK9Ji002595
	for perforce@freebsd.org; Sat, 1 Oct 2005 23:20:09 GMT
	(envelope-from wsalamon@computer.org)
Date: Sat, 1 Oct 2005 23:20:09 GMT
Message-Id: <200510012320.j91NK9Ji002595@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 84632 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, 01 Oct 2005 23:20:21 -0000

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

Change 84632 by wsalamon@gretsch on 2005/10/01 23:19:27

	Move some function definitions and common defines into the kernel 
	private header in preparation for new system call source file. 
	Define the include guard to be similar to the file name.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#3 (text+ko) ====

@@ -21,15 +21,24 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
-#ifndef _BSM_AUDIT_KLIB_H_
-#define _BSM_AUDIT_KLIB_H_
+#ifndef _BSM_AUDIT_PRIVATE_H
+#define _BSM_AUDIT_PRIVATE_H
 
 #define AU_PRS_SUCCESS  1
 #define AU_PRS_FAILURE  2
 #define AU_PRS_BOTH     (AU_PRS_SUCCESS|AU_PRS_FAILURE)
+/* 
+ * Flags to use on audit files when opening and closing.
+ */
+#define AUDIT_OPEN_FLAGS FWRITE | O_APPEND
+#define AUDIT_CLOSE_FLAGS FWRITE | O_APPEND
 
 #ifdef _KERNEL
+#include <sys/fcntl.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <security/audit/audit.h>
+
 /*
  * Some of the BSM tokenizer functions take different parameters in the
  * kernel implementations in order to save the copying of large kernel
@@ -58,6 +67,13 @@
 void audit_trigger_init(void);
 void send_trigger(unsigned int trigger);
 
+/*
+ * General audit related functions.
+ */
+struct kaudit_record * currecord(void);
+void audit_shutdown(void *arg, int howto);
+void audit_rotate_vnode(struct ucred *cred, struct vnode *vp);
+
 #endif /* _KERNEL */
 
-#endif /* ! _BSM_AUDIT_KLIB_H_ */
+#endif /* ! _BSM_AUDIT_PRIVATE_H */