PERFORCE change 90792 for review
Robert Watson
rwatson at FreeBSD.org
Tue Jan 31 15:44:38 GMT 2006
http://perforce.freebsd.org/chv.cgi?CH=90792
Change 90792 by rwatson at rwatson_zoo on 2006/01/31 15:43:51
Copyright canonicalization.
$P4$
Minor style tweaks.
OpenBSM man page trailer.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 edit
.. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#2 edit
.. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#2 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 $
#
CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I.
==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#2 (text+ko) ====
@@ -1,4 +1,5 @@
-.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved.
+.\" Copyright (c) 2004 Apple Computer, Inc.
+.\" All rights reserved.
.\"
.\" @APPLE_BSD_LICENSE_HEADER_START@
.\"
@@ -28,6 +29,8 @@
.\"
.\" @APPLE_BSD_LICENSE_HEADER_END@
.\"
+.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#2 $
+.\"
.Dd Jan 24, 2004
.Dt AUDIT 8
.Os
@@ -69,3 +72,15 @@
.Sh SEE ALSO
.Xr auditd 8
.Xr audit_control 5
+.Sh AUTHORS
+This software was created by McAfee Research, the security research division
+of McAfee, Inc., under contract to Apple Computer Inc.
+Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc.
+.Pp
+The Basic Security Module (BSM) interface to audit records and audit event
+stream format were defined by Sun Microsystems.
+.Sh HISTORY
+The OpenBSM implementation was created by McAfee Research, the security
+division of McAfee Inc., under contract to Apple Computer Inc. in 2004.
+It was subsequently adopted by the TrustedBSD Project as the foundation for
+the OpenBSM distribution.
==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#2 (text+ko) ====
@@ -1,21 +1,22 @@
/*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005 Apple Computer, Inc.
+ * All rights reserved.
*
* @APPLE_BSD_LICENSE_HEADER_START@
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
+ * from this software without specific prior written permission.
+ *
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -26,8 +27,10 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* @APPLE_BSD_LICENSE_HEADER_END@
+ *
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#2 $
*/
/*
* Program to trigger the audit daemon with a message that is either:
@@ -48,8 +51,10 @@
#include <stdlib.h>
#include <unistd.h>
-void usage()
+static void
+usage(void)
{
+
(void)fprintf(stderr, "Usage: audit -n | -s | -t \n");
exit(-1);
}
@@ -57,12 +62,13 @@
/*
* Main routine to process command line options.
*/
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
{
char ch;
unsigned int trigger = 0;
- if (argc != 2)
+ if (argc != 2)
usage();
while ((ch = getopt(argc, argv, "nst")) != -1) {
@@ -72,7 +78,7 @@
trigger = AUDIT_TRIGGER_OPEN_NEW;
break;
- case 's':
+ case 's':
trigger = AUDIT_TRIGGER_READ_FILE;
break;
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list