aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2012-12-01 00:02:31 +0000
committerRobert Watson <rwatson@FreeBSD.org>2012-12-01 00:02:31 +0000
commit399d3f65db6c7d2b9e9f56ec3062b520d8e0e433 (patch)
tree0ab16fdb4fa3754ddf5aea22c65c917ad00a0fb7
parentc5119f5dec6ac1aac7c290cbe194ca9d2cadad99 (diff)
downloadsrc-399d3f65db6c7d2b9e9f56ec3062b520d8e0e433.tar.gz
src-399d3f65db6c7d2b9e9f56ec3062b520d8e0e433.zip
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@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@rwatson_cinnamon Remove Apple acknowledgement clause from file with Christian Peron copyright (with permission from Christian). Change 219836 on 2012/11/23 by rwatson@rwatson_cinnamon Replace further instances of <> with "" for local includes in auditdistd. Change 219834 on 2012/11/23 by rwatson@rwatson_cinnamon For current-directory headers, use #include "" rather than #include <>. Change 219832 on 2012/11/23 by rwatson@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@pjd_anger Add Xref to auditdistd(8). Suggested by: rwatson Obtained from: TrustedBSD Project Sponsored by: The FreeBSD Foundation (auditdistd)
Notes
Notes: svn path=/vendor/openbsm/dist/; revision=243734
-rw-r--r--bin/auditd/auditd.83
-rw-r--r--bin/auditdistd/auditdistd.c7
-rw-r--r--bin/auditdistd/parse.y7
-rw-r--r--bin/auditdistd/proto_tcp.c6
-rw-r--r--bin/auditdistd/proto_tls.c6
-rw-r--r--bin/auditdistd/proto_uds.c6
-rw-r--r--bin/auditdistd/receiver.c7
-rw-r--r--bin/auditdistd/sandbox.c9
-rw-r--r--bin/auditdistd/sender.c7
-rw-r--r--bin/auditdistd/sigtimedwait.h4
-rw-r--r--bin/auditdistd/subr.c7
-rw-r--r--bin/auditdistd/synch.h8
-rw-r--r--bin/auditdistd/token.l4
-rw-r--r--bin/auditdistd/trail.c7
-rw-r--r--bin/praudit/praudit.c4
-rw-r--r--libbsm/audit_submit.35
-rw-r--r--libbsm/bsm_audit.c4
-rw-r--r--libbsm/bsm_class.c4
-rw-r--r--libbsm/bsm_io.c4
-rw-r--r--sys/bsm/audit_internal.h4
20 files changed, 46 insertions, 67 deletions
diff --git a/bin/auditd/auditd.8 b/bin/auditd/auditd.8
index 1fcebd7f6cc8..b4375245a10c 100644
--- a/bin/auditd/auditd.8
+++ b/bin/auditd/auditd.8
@@ -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 to
.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
diff --git a/bin/auditdistd/auditdistd.c b/bin/auditdistd/auditdistd.c
index 2cab2760205b..436531db14f2 100644
--- a/bin/auditdistd/auditdistd.c
+++ b/bin/auditdistd/auditdistd.c
@@ -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"
diff --git a/bin/auditdistd/parse.y b/bin/auditdistd/parse.y
index 22761624eb09..fbe1000f82b2 100644
--- a/bin/auditdistd/parse.y
+++ b/bin/auditdistd/parse.y
@@ -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;
diff --git a/bin/auditdistd/proto_tcp.c b/bin/auditdistd/proto_tcp.c
index b0fb4e0732c3..74d5cd45c502 100644
--- a/bin/auditdistd/proto_tcp.c
+++ b/bin/auditdistd/proto_tcp.c
@@ -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>
diff --git a/bin/auditdistd/proto_tls.c b/bin/auditdistd/proto_tls.c
index bcb461c63ab2..faeb3d8882de 100644
--- a/bin/auditdistd/proto_tls.c
+++ b/bin/auditdistd/proto_tls.c
@@ -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>
diff --git a/bin/auditdistd/proto_uds.c b/bin/auditdistd/proto_uds.c
index 1fdb7a7fc729..3b3dfb7bbacb 100644
--- a/bin/auditdistd/proto_uds.c
+++ b/bin/auditdistd/proto_uds.c
@@ -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>
diff --git a/bin/auditdistd/receiver.c b/bin/auditdistd/receiver.c
index fe08a3c332a3..698619d47326 100644
--- a/bin/auditdistd/receiver.c
+++ b/bin/auditdistd/receiver.c
@@ -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"
diff --git a/bin/auditdistd/sandbox.c b/bin/auditdistd/sandbox.c
index ada6788f8d25..9e4f13466053 100644
--- a/bin/auditdistd/sandbox.c
+++ b/bin/auditdistd/sandbox.c
@@ -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
diff --git a/bin/auditdistd/sender.c b/bin/auditdistd/sender.c
index 4aac864a1ef7..256fbb1f4759 100644
--- a/bin/auditdistd/sender.c
+++ b/bin/auditdistd/sender.c
@@ -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"
diff --git a/bin/auditdistd/sigtimedwait.h b/bin/auditdistd/sigtimedwait.h
index 7a074ea9d767..187c6d6dec1b 100644
--- a/bin/auditdistd/sigtimedwait.h
+++ b/bin/auditdistd/sigtimedwait.h
@@ -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,
diff --git a/bin/auditdistd/subr.c b/bin/auditdistd/subr.c
index 26f4745e3b8f..e98ed1e74480 100644
--- a/bin/auditdistd/subr.c
+++ b/bin/auditdistd/subr.c
@@ -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
diff --git a/bin/auditdistd/synch.h b/bin/auditdistd/synch.h
index 30a2a6f31fe4..e6fe19d1c624 100644
--- a/bin/auditdistd/synch.h
+++ b/bin/auditdistd/synch.h
@@ -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>
diff --git a/bin/auditdistd/token.l b/bin/auditdistd/token.l
index a626e1593d75..9cebac1e22d9 100644
--- a/bin/auditdistd/token.l
+++ b/bin/auditdistd/token.l
@@ -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>
diff --git a/bin/auditdistd/trail.c b/bin/auditdistd/trail.c
index 59ad8491f922..d4be51eeed36 100644
--- a/bin/auditdistd/trail.c
+++ b/bin/auditdistd/trail.c
@@ -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
diff --git a/bin/praudit/praudit.c b/bin/praudit/praudit.c
index 561ffc9d31dd..f20f245ec02e 100644
--- a/bin/praudit/praudit.c
+++ b/bin/praudit/praudit.c
@@ -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 $
*/
/*
diff --git a/libbsm/audit_submit.3 b/libbsm/audit_submit.3
index a320c7c2fdc8..ab1fc64be429 100644
--- a/libbsm/audit_submit.3
+++ b/libbsm/audit_submit.3
@@ -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
diff --git a/libbsm/bsm_audit.c b/libbsm/bsm_audit.c
index 9930bc313afb..693419f32e8e 100644
--- a/libbsm/bsm_audit.c
+++ b/libbsm/bsm_audit.c
@@ -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>
diff --git a/libbsm/bsm_class.c b/libbsm/bsm_class.c
index 1978e442c650..358afbb85acb 100644
--- a/libbsm/bsm_class.c
+++ b/libbsm/bsm_class.c
@@ -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>
diff --git a/libbsm/bsm_io.c b/libbsm/bsm_io.c
index 0de8080977ac..85fab590b402 100644
--- a/libbsm/bsm_io.c
+++ b/libbsm/bsm_io.c
@@ -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>
diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h
index 71a51307ab98..21176c8cf26c 100644
--- a/sys/bsm/audit_internal.h
+++ b/sys/bsm/audit_internal.h
@@ -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