From owner-p4-projects@FreeBSD.ORG  Tue Jun 24 00:00:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8FC5B1065677; Tue, 24 Jun 2008 00:00:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51BCF1065675
	for <perforce@FreeBSD.org>; Tue, 24 Jun 2008 00:00:49 +0000 (UTC)
	(envelope-from sson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 376BE8FC20
	for <perforce@FreeBSD.org>; Tue, 24 Jun 2008 00:00:49 +0000 (UTC)
	(envelope-from sson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5O00n12043992
	for <perforce@FreeBSD.org>; Tue, 24 Jun 2008 00:00:49 GMT
	(envelope-from sson@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O00nUF043990
	for perforce@freebsd.org; Tue, 24 Jun 2008 00:00:49 GMT
	(envelope-from sson@FreeBSD.org)
Date: Tue, 24 Jun 2008 00:00:49 GMT
Message-Id: <200806240000.m5O00nUF043990@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sson@FreeBSD.org using -f
From: Stacey Son <sson@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 144001 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, 24 Jun 2008 00:00:50 -0000

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

Change 144001 by sson@sson_amd64 on 2008/06/24 00:00:17

	Don't need to open audit trigger file if using Mach IPC.	

Affected files ...

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

Differences ...

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

@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#27 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#28 $
  */
 
 #include <sys/types.h>
@@ -77,11 +77,11 @@
 static int	 ret, minval;
 static char	*lastfile = NULL;
 static int	 allhardcount = 0;
-static int	 triggerfd = 0;
 static int	 sigchlds, sigchlds_handled;
 static int	 sighups, sighups_handled;
 #ifndef USE_MACH_IPC
 static int	 sigterms, sigterms_handled;
+static int	 triggerfd = 0;
 
 #else /* USE_MACH_IPC */
 
@@ -449,7 +449,7 @@
 	}
 	endac();
 
-#ifdef USE_MACH_IPC
+#ifndef USE_MACH_IPC
 	if (close(triggerfd) != 0)
 		syslog(LOG_ERR, "Error closing control file");
 #endif
@@ -1050,12 +1050,12 @@
 
 #ifdef USE_MACH_IPC
 	mach_setup();
-#endif
-
+#else
 	if ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)) < 0) {
 		syslog(LOG_ERR, "Error opening trigger file");
 		fail_exit();
 	}
+#endif
 
 	/*
 	 * To provide event feedback cycles and avoid auditd becoming