From owner-p4-projects@FreeBSD.ORG  Sun Feb 12 01:18:32 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 5AA1C16A423; Sun, 12 Feb 2006 01:18:32 +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 2839416A422
	for <perforce@freebsd.org>; Sun, 12 Feb 2006 01:18: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 6B1EB43D55
	for <perforce@freebsd.org>; Sun, 12 Feb 2006 01:18:30 +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 k1C1IUbV021846
	for <perforce@freebsd.org>; Sun, 12 Feb 2006 01:18:30 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 k1C1IU8q021843
	for perforce@freebsd.org; Sun, 12 Feb 2006 01:18:30 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 12 Feb 2006 01:18:30 GMT
Message-Id: <200602120118.k1C1IU8q021843@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 91600 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: Sun, 12 Feb 2006 01:18:33 -0000

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

Change 91600 by rwatson@rwatson_peppercorn on 2006/02/12 01:17:49

	Integrate last few changes from OpenBSM 1.0 alpha 4 from OpenBSM
	branch to TrustedBSD audit3 branch.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 (text+ko) ====

@@ -64,6 +64,7 @@
     Poul-Henning Kamp
     Christian Brueffer
     Olivier Houchard
+    Christian Peron
 
 In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel
 Software's FlexeLint tool were used to identify a number of bugs in the
@@ -85,4 +86,4 @@
 
     http://www.TrustedBSD.org/
 
-$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#7 $
+$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 $

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#4 $
+# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 $
 #
 
 MAN=	audit.2								\
@@ -16,4 +16,7 @@
 	audit_user.5							\
 	audit_warn.5
 
+MLINKS= getaudit.2 getaudit_addr.2					\
+	setaudit.2 setaudit_addr.2
+
 .include <bsd.prog.mk>

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#5 $
+ * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 $
  */
 
 #include <bsm/libbsm.h>
@@ -41,7 +41,7 @@
 usage(void)
 {
 
-	fprintf(stderr, "usage: dump [class|class_r|control|event|event_r|"
+	fprintf(stderr, "usage: audump [class|class_r|control|event|event_r|"
 	    "user|user_r]\n");
 	exit(-1);
 }