svn commit: r243734 - in vendor/openbsm/dist: bin/auditd bin/auditdistd bin/praudit libbsm sys/bsm
Robert Watson
rwatson at FreeBSD.org
Sat Dec 1 00:02:32 UTC 2012
Author: rwatson
Date: Sat Dec 1 00:02:31 2012
New Revision: 243734
URL: http://svnweb.freebsd.org/changeset/base/243734
Log:
Merge a number of post-1.2-alpha2 changes to OpenBSM into the OpenBSM
vendor area; these sort out various post-release issues, largely to do
with integrating OpenBSM with the base FreeBSD build. All of these
changes will appear in a future 1.2-alpha3:
Change 219846 on 2012/11/26 by rwatson at rwatson_cinnamon
Update several instances of Apple Computer to Apple; a change made
in the FreeBSD tree some years ago but not propagated to OpenBSM.
Change 219845 on 2012/11/26 by rwatson at rwatson_cinnamon
Remove Apple acknowledgement clause from file with Christian
Peron copyright (with permission from Christian).
Change 219836 on 2012/11/23 by rwatson at rwatson_cinnamon
Replace further instances of <> with "" for local includes in
auditdistd.
Change 219834 on 2012/11/23 by rwatson at rwatson_cinnamon
For current-directory headers, use #include "" rather than #include
<>.
Change 219832 on 2012/11/23 by rwatson at rwatson_cinnamon
Be more consistent with the remainder of OpenBSM and include
config/config.h rather than config.h.
Don't include config.h from synch.h, which is included only from
.c files that already include config.h.
Change 219831 on 2012/11/23 by pjd at pjd_anger
Add Xref to auditdistd(8).
Suggested by: rwatson
Obtained from: TrustedBSD Project
Sponsored by: The FreeBSD Foundation (auditdistd)
Modified:
vendor/openbsm/dist/bin/auditd/auditd.8
vendor/openbsm/dist/bin/auditdistd/auditdistd.c
vendor/openbsm/dist/bin/auditdistd/parse.y
vendor/openbsm/dist/bin/auditdistd/proto_tcp.c
vendor/openbsm/dist/bin/auditdistd/proto_tls.c
vendor/openbsm/dist/bin/auditdistd/proto_uds.c
vendor/openbsm/dist/bin/auditdistd/receiver.c
vendor/openbsm/dist/bin/auditdistd/sandbox.c
vendor/openbsm/dist/bin/auditdistd/sender.c
vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h
vendor/openbsm/dist/bin/auditdistd/subr.c
vendor/openbsm/dist/bin/auditdistd/synch.h
vendor/openbsm/dist/bin/auditdistd/token.l
vendor/openbsm/dist/bin/auditdistd/trail.c
vendor/openbsm/dist/bin/praudit/praudit.c
vendor/openbsm/dist/libbsm/audit_submit.3
vendor/openbsm/dist/libbsm/bsm_audit.c
vendor/openbsm/dist/libbsm/bsm_class.c
vendor/openbsm/dist/libbsm/bsm_io.c
vendor/openbsm/dist/sys/bsm/audit_internal.h
Modified: vendor/openbsm/dist/bin/auditd/auditd.8
==============================================================================
--- vendor/openbsm/dist/bin/auditd/auditd.8 Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditd/auditd.8 Sat Dec 1 00:02:31 2012 (r243734)
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#18 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#19 $
.\"
.Dd December 11, 2008
.Dt AUDITD 8
@@ -122,6 +122,7 @@ and are no longer available as arguments
.Xr audit_event 5 ,
.Xr audit_warn 5 ,
.Xr audit 8 ,
+.Xr auditdistd 8 ,
.Xr launchd 8
.Sh HISTORY
The OpenBSM implementation was created by McAfee Research, the security
Modified: vendor/openbsm/dist/bin/auditdistd/auditdistd.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/auditdistd.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/auditdistd.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,10 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#3 $
*/
-#include "config.h"
+#include <config/config.h>
#include <sys/param.h>
#if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP)
@@ -75,9 +75,8 @@
#include "sigtimedwait.h"
#endif
-#include <pjdlog.h>
-
#include "auditdistd.h"
+#include "pjdlog.h"
#include "proto.h"
#include "subr.h"
#include "synch.h"
Modified: vendor/openbsm/dist/bin/auditdistd/parse.y
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/parse.y Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/parse.y Sat Dec 1 00:02:31 2012 (r243734)
@@ -27,10 +27,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#3 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#5 $
*/
-#include "config.h"
+#include <config/config.h>
#include <sys/types.h>
#include <sys/queue.h>
@@ -48,9 +48,8 @@
#include <compat/strlcpy.h>
#endif
-#include <pjdlog.h>
-
#include "auditdistd.h"
+#include "pjdlog.h"
extern int depth;
extern int lineno;
Modified: vendor/openbsm/dist/bin/auditdistd/proto_tcp.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_tcp.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/proto_tcp.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -27,12 +27,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 $
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config/config.h>
#include <sys/param.h> /* MAXHOSTNAMELEN */
#include <sys/socket.h>
Modified: vendor/openbsm/dist/bin/auditdistd/proto_tls.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_tls.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/proto_tls.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,12 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 $
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config/config.h>
#include <sys/param.h> /* MAXHOSTNAMELEN */
#include <sys/socket.h>
Modified: vendor/openbsm/dist/bin/auditdistd/proto_uds.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_uds.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/proto_uds.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,14 +26,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 $
*/
/* UDS - UNIX Domain Socket */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config/config.h>
#include <sys/types.h>
#include <sys/socket.h>
Modified: vendor/openbsm/dist/bin/auditdistd/receiver.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/receiver.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/receiver.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,10 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#3 $
*/
-#include "config.h"
+#include <config/config.h>
#include <sys/param.h>
#if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP)
@@ -78,9 +78,8 @@
#include "renameat.h"
#endif
-#include <pjdlog.h>
-
#include "auditdistd.h"
+#include "pjdlog.h"
#include "proto.h"
#include "sandbox.h"
#include "subr.h"
Modified: vendor/openbsm/dist/bin/auditdistd/sandbox.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/sandbox.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/sandbox.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,12 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#3 $
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config/config.h>
#include <sys/param.h>
#ifdef HAVE_JAIL
@@ -50,8 +48,7 @@
#include <strings.h>
#include <unistd.h>
-#include <pjdlog.h>
-
+#include "pjdlog.h"
#include "sandbox.h"
static int
Modified: vendor/openbsm/dist/bin/auditdistd/sender.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/sender.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/sender.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,10 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#3 $
*/
-#include "config.h"
+#include <config/config.h>
#include <sys/param.h>
#if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP)
@@ -72,9 +72,8 @@
#include "sigtimedwait.h"
#endif
-#include <pjdlog.h>
-
#include "auditdistd.h"
+#include "pjdlog.h"
#include "proto.h"
#include "sandbox.h"
#include "subr.h"
Modified: vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sigtimedwait.h#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sigtimedwait.h#2 $
*/
#ifndef _SIGTIMEDWAIT_H_
@@ -42,7 +42,7 @@
#include <string.h>
#include <unistd.h>
-#include <pjdlog.h>
+#include "pjdlog.h"
static int
sigtimedwait(const sigset_t *set, siginfo_t *info,
Modified: vendor/openbsm/dist/bin/auditdistd/subr.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/subr.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/subr.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -23,10 +23,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#3 $
*/
-#include "config.h"
+#include <config/config.h>
#ifdef HAVE_KQUEUE
#include <sys/types.h>
@@ -48,9 +48,8 @@
#include <compat/strlcat.h>
#endif
-#include <pjdlog.h>
-
#include "auditdistd.h"
+#include "pjdlog.h"
#include "subr.h"
int
Modified: vendor/openbsm/dist/bin/auditdistd/synch.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/synch.h Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/synch.h Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,16 +26,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#3 $
*/
#ifndef _SYNCH_H_
#define _SYNCH_H_
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <errno.h>
#include <pthread.h>
#ifdef HAVE_PTHREAD_NP_H
@@ -44,7 +40,7 @@
#include <stdbool.h>
#include <time.h>
-#include <pjdlog.h>
+#include "pjdlog.h"
#ifndef PJDLOG_ASSERT
#include <assert.h>
Modified: vendor/openbsm/dist/bin/auditdistd/token.l
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/token.l Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/token.l Sat Dec 1 00:02:31 2012 (r243734)
@@ -27,10 +27,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 $
*/
-#include "config.h"
+#include <config/config.h>
#include <stdio.h>
#include <string.h>
Modified: vendor/openbsm/dist/bin/auditdistd/trail.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/trail.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/auditdistd/trail.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -26,10 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#3 $
*/
-#include "config.h"
+#include <config/config.h>
#include <sys/param.h>
#include <sys/stat.h>
@@ -60,8 +60,7 @@
#include "unlinkat.h"
#endif
-#include <pjdlog.h>
-
+#include "pjdlog.h"
#include "trail.h"
#define TRAIL_MAGIC 0x79a11
Modified: vendor/openbsm/dist/bin/praudit/praudit.c
==============================================================================
--- vendor/openbsm/dist/bin/praudit/praudit.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/bin/praudit/praudit.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -11,7 +11,7 @@
* 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple 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.
*
@@ -27,7 +27,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#15 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#16 $
*/
/*
Modified: vendor/openbsm/dist/libbsm/audit_submit.3
==============================================================================
--- vendor/openbsm/dist/libbsm/audit_submit.3 Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/libbsm/audit_submit.3 Sat Dec 1 00:02:31 2012 (r243734)
@@ -11,9 +11,6 @@
.\" 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.
-.\" 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.
.\"
.\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -27,7 +24,7 @@
.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#18 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#19 $
.\"
.Dd January 18, 2008
.Dt AUDIT_SUBMIT 3
Modified: vendor/openbsm/dist/libbsm/bsm_audit.c
==============================================================================
--- vendor/openbsm/dist/libbsm/bsm_audit.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/libbsm/bsm_audit.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -14,7 +14,7 @@
* 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple 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.
*
@@ -30,7 +30,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#36 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#37 $
*/
#include <sys/types.h>
Modified: vendor/openbsm/dist/libbsm/bsm_class.c
==============================================================================
--- vendor/openbsm/dist/libbsm/bsm_class.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/libbsm/bsm_class.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -11,7 +11,7 @@
* 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple 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.
*
@@ -27,7 +27,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#15 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#16 $
*/
#include <config/config.h>
Modified: vendor/openbsm/dist/libbsm/bsm_io.c
==============================================================================
--- vendor/openbsm/dist/libbsm/bsm_io.c Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/libbsm/bsm_io.c Sat Dec 1 00:02:31 2012 (r243734)
@@ -16,7 +16,7 @@
* 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple 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.
*
@@ -32,7 +32,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#74 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#75 $
*/
#include <sys/types.h>
Modified: vendor/openbsm/dist/sys/bsm/audit_internal.h
==============================================================================
--- vendor/openbsm/dist/sys/bsm/audit_internal.h Fri Nov 30 23:54:57 2012 (r243733)
+++ vendor/openbsm/dist/sys/bsm/audit_internal.h Sat Dec 1 00:02:31 2012 (r243734)
@@ -15,7 +15,7 @@
* 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple 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.
*
@@ -30,7 +30,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#5 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#6 $
*/
#ifndef _AUDIT_INTERNAL_H
More information about the svn-src-all
mailing list