PERFORCE change 91600 for review

[Robert Watson]

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

Change 91600 by rwatson at 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);
 }