From owner-p4-projects@FreeBSD.ORG  Tue Jan 31 15:41:35 2006
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 B428C16A423; Tue, 31 Jan 2006 15:41:34 +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 7009516A420
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 15:41:34 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3674043D45
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 15:41:34 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFfY8H045958
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 15:41:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFfX64045955
	for perforce@freebsd.org; Tue, 31 Jan 2006 15:41:33 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 31 Jan 2006 15:41:33 GMT
Message-Id: <200601311541.k0VFfX64045955@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>
Cc: 
Subject: PERFORCE change 90790 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: Tue, 31 Jan 2006 15:41:35 -0000

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

Change 90790 by rwatson@rwatson_zoo on 2006/01/31 15:40:44

	When re-reading the audit configuration files due to a read file
	trigger, also set the kernel state.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#8 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#7 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#8 $
  */
 
 #include <sys/dirent.h>
@@ -520,6 +520,8 @@
 		syslog(LOG_INFO, "Got read file trigger\n");
 		if (read_control_file() == -1)
 			syslog(LOG_ERR, "Error in audit control file\n");
+		if (config_audit_controls() == -1)
+			syslog(LOG_ERR, "Error setting audit controls\n");
 		break;
 
 	default: