From owner-p4-projects@FreeBSD.ORG  Thu Dec 30 04:24:50 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD8F216A4D0; Thu, 30 Dec 2004 04:24:49 +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 92FF616A4CE
	for <perforce@freebsd.org>; Thu, 30 Dec 2004 04:24:49 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7EB4B43D31
	for <perforce@freebsd.org>; Thu, 30 Dec 2004 04:24:49 +0000 (GMT)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBU4OnwB074531
	for <perforce@freebsd.org>; Thu, 30 Dec 2004 04:24:49 GMT
	(envelope-from trhodes@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBU4Onwk074528
	for perforce@freebsd.org; Thu, 30 Dec 2004 04:24:49 GMT
	(envelope-from trhodes@freebsd.org)
Date: Thu, 30 Dec 2004 04:24:49 GMT
Message-Id: <200412300424.iBU4Onwk074528@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trhodes@freebsd.org using -f
From: Tom Rhodes <trhodes@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 67882 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, 30 Dec 2004 04:24:50 -0000

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

Change 67882 by trhodes@trhodes_local on 2004/12/30 04:24:44

	Make this file more realistic by gathering the flags passed in rc.conf.  Add required files as requested by Wayne.

Affected files ...

.. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#2 (text+ko) ====

@@ -12,31 +12,12 @@
 . /etc/rc.subr
 
 name="auditd"
-start_cmd="auditd_start"
 stop_cmd="auditd_stop"
-
-auditd_start()
-{
-if checkyesno auditd_enable; then
-        echo "Starting the audit daemon"
-        if [ -f /usr/sbin/auditd ]; then
-		/usr/sbin/auditd
-fi
-
-
-elif checkyesno auditd_failstop_enable; then
-	echo "Starting the audit daemon"
-	if [ -f /usr/sbin/auditd ]; then
-		/usr/sbin/auditd -s
-fi
-
-elif checkyesno auditd_failhalt_enable; then
-	echo "Starting the audit daemon"
-        if [ -f /usr/sbin/auditd ]; then
-                /usr/sbin/auditd -h
-	fi
-fi
-}
+command="/usr/sbin/${name}"
+rcvar="auditd_enable"
+command_args="${auditd_flags}"
+requited_files="/etc/audit_class /etc/audit_control /etc/audit_event
+		/etc/audit_user /etc/audit_warn /etc/auditd_control"
 
 auditd_stop()
 {