From owner-trustedbsd-cvs@FreeBSD.ORG  Sun Mar 19 21:32:57 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0CA3416A423
	for <trustedbsd-cvs@freebsd.org>; Sun, 19 Mar 2006 21:32:57 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 38D9B43D48
	for <trustedbsd-cvs@freebsd.org>; Sun, 19 Mar 2006 21:32:45 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 87A8246B9A
	for <trustedbsd-cvs@trustedbsd.org>;
	Sun, 19 Mar 2006 16:32:44 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 2F8047274B;
	Sun, 19 Mar 2006 21:31:51 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 24DC416A423; Sun, 19 Mar 2006 21:31:51 +0000 (UTC)
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 F38D716A41F
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 21:31:50 +0000 (UTC)
	(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 C029743D45
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 21:31:50 +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 k2JLVox0034101
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 21:31:50 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 k2JLVo0m034098
	for perforce@freebsd.org; Sun, 19 Mar 2006 21:31:50 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 19 Mar 2006 21:31:50 GMT
Message-Id: <200603192131.k2JLVo0m034098@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 93603 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Mar 2006 21:32:57 -0000

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

Change 93603 by rwatson@rwatson_peppercorn on 2006/03/19 21:31:14

	Rename wait_for_triggers() to wait_for_events(), as it is waiting
	for both triggers and signals to perform state transitions.

Affected files ...

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

Differences ...

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

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 $
  */
 
 #include <sys/types.h>
@@ -596,10 +596,10 @@
 }
 
 /*
- * Read the control file for triggers and handle appropriately.
+ * Read the control file for triggers/signals and handle appropriately.
  */
 static int
-wait_for_triggers(void)
+wait_for_events(void)
 {
 	int num;
 	unsigned int trigger;
@@ -814,7 +814,7 @@
 
 	setup();
 
-	rc = wait_for_triggers();
+	rc = wait_for_events();
 	syslog(LOG_INFO, "auditd exiting.\n");
 
 	exit(rc);