From owner-p4-projects@FreeBSD.ORG  Sat Feb  4 00:54:33 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 3732016A423; Sat,  4 Feb 2006 00:54:33 +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 EC32716A420
	for <perforce@freebsd.org>; Sat,  4 Feb 2006 00:54:32 +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 B838F43D46
	for <perforce@freebsd.org>; Sat,  4 Feb 2006 00:54:32 +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 k140sWvS058996
	for <perforce@freebsd.org>; Sat, 4 Feb 2006 00:54:32 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 k140sWx8058993
	for perforce@freebsd.org; Sat, 4 Feb 2006 00:54:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 4 Feb 2006 00:54:32 GMT
Message-Id: <200602040054.k140sWx8058993@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 91021 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: Sat, 04 Feb 2006 00:54:34 -0000

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

Change 91021 by rwatson@rwatson_peppercorn on 2006/02/04 00:53:39

	Merge audit event name fix from audit3 contrib/openbsm/bsm to
	sys/bsm.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#17 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#17 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#16 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#17 $
  */
 
 #ifndef _BSM_AUDIT_KEVENTS_H_
@@ -372,7 +372,7 @@
 #define	AUE_PIVOT_ROOT		391	/* Linux-specific. */
 #define	AUE_RTPRIO		392	/* FreeBSD-specific. */
 #define	AUE_SCHED_GETPARAM	393	/* POSIX.1b. */
-#define	AUE_SCHED_GETPARAM	394	/* POSIX.1b. */
+#define	AUE_SCHED_SETPARAM	394	/* POSIX.1b. */
 #define	AUE_SCHED_GET_PRIORITY_MAX	395	/* POSIX.1b. */
 #define	AUE_SCHED_GET_PRIORITY_MIN	396	/* POSIX.1b. */
 #define	AUE_SCHED_RR_GET_INTERVAL	397	/* POSIX.1b. */