From owner-p4-projects@FreeBSD.ORG  Mon Jun  6 00:33:09 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 ABD7516A420; Mon,  6 Jun 2005 00:33:08 +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 8793716A41C
	for <perforce@freebsd.org>; Mon,  6 Jun 2005 00:33:08 +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 31B4F43D58
	for <perforce@freebsd.org>; Mon,  6 Jun 2005 00:33:08 +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 j560X85U005568
	for <perforce@freebsd.org>; Mon, 6 Jun 2005 00:33:08 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j560X7h9005565
	for perforce@freebsd.org; Mon, 6 Jun 2005 00:33:07 GMT
	(envelope-from wsalamon@computer.org)
Date: Mon, 6 Jun 2005 00:33:07 GMT
Message-Id: <200506060033.j560X7h9005565@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 78047 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: Mon, 06 Jun 2005 00:33:09 -0000

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

Change 78047 by wsalamon@rickenbacker on 2005/06/06 00:32:38

	Changes necessary to sync with the current kernel; specifically, the
	auditctl() system call.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit.h#6 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#6 (text+ko) ====

@@ -32,8 +32,11 @@
 /*
  * Triggers for the audit daemon
  */
-#define AUDIT_TRIGGER_LOW_SPACE	1
-#define AUDIT_TRIGGER_FILE_FULL	2
+#define AUDIT_TRIGGER_LOW_SPACE		1
+#define AUDIT_TRIGGER_OPEN_NEW		2
+#define AUDIT_TRIGGER_READ_FILE		3
+#define AUDIT_TRIGGER_CLOSE_AND_DIE	4
+#define AUDIT_TRIGGER_NO_SPACE		5
 
 /*
  * Pre-defined audit IDs
@@ -146,6 +149,13 @@
 
 #define	AU_FS_MINFREE	20   /* default min filesystem freespace, in percent */
 
+/*
+ * auditctl(2) commands
+ */
+#define AC_SETLOGFILE	1
+#define AC_SHUTDOWN	2
+#define AC_SENDTRIGGER	3
+
 __BEGIN_DECLS
 
 typedef uid_t au_id_t;
@@ -281,7 +291,7 @@
 
 int audit (const void *, int);
 int auditon (int, void *, int);
-int auditctl (const char *);
+int auditctl (int, const void *, u_int);
 int getauid (au_id_t *);
 int setauid (const au_id_t *);
 int getaudit (struct auditinfo *);