Merge OpenBSM 1.2 alpha 4.

MFC after: 2 weeks Relnotes: yes
author: Christian Brueffer <brueffer@FreeBSD.org> 2015-12-18 09:48:01 +0000
committer: Christian Brueffer <brueffer@FreeBSD.org> 2015-12-18 09:48:01 +0000
commit: b6a05070fa77edc7ce6e60b61623fd806e807be6 (patch)
tree: aa8cfe0cdfd8d3707778fac1df526d01b514cb3d /contrib/openbsm
parent: 88dd7272909c2ab5b796751d679cd9cb67c32cca (diff)
parent: 97aa9e7383bb228ff968ff77101bfa4b68358784 (diff)
download: src-test-b6a05070fa77edc7ce6e60b61623fd806e807be6.tar.gz
src-test-b6a05070fa77edc7ce6e60b61623fd806e807be6.zip
160 files changed, 525 insertions, 451 deletions
diff --git a/contrib/openbsm/.travis.yml b/contrib/openbsm/.travis.yml
new file mode 100644
index 0000000000000..5540774c7c130
--- /dev/null
+++ b/contrib/openbsm/.travis.yml
@@ -0,0 +1,18 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+os:
+  - linux
+  - osx
+
+before_install:
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      sudo apt-get -qq update;
+      sudo apt-get -qq install byacc flex;
+    elif [ $TRAVIS_OS_NAME == "osx" ]; then
+      brew update;
+      brew install byacc flex;
+    fi
diff --git a/contrib/openbsm/INSTALL b/contrib/openbsm/INSTALL
index 9e52b0d435a62..307a3bb65000c 100644
--- a/contrib/openbsm/INSTALL
+++ b/contrib/openbsm/INSTALL
@@ -3,7 +3,7 @@ OpenBSM Build and Installation Instructions
 OpenBSM is currently built using autoconf and automake, which should allow
 for building on a range of operating systems, including FreeBSD, Mac OS X,
 and Linux.  Some components are built only if appropriate kernel audit
-suppport is found.  Typical builds will be performed using:
+support is found.  Typical builds will be performed using:
 
     ./configure
     make
@@ -31,7 +31,7 @@ not configurable.
 You may wish to specify that the OpenBSM components not be installed in the
 base system, rather in a specific directory.  This may be done using the
 --prefix argument to configure.  If installing to a specific directory,
-remember to update your library path so that running tools from that
+remember to update your library path so that when running tools from that
 directory the correct libbsm is used:
 
     ./configure --prefix=/home/rwatson/openbsm
diff --git a/contrib/openbsm/LICENSE b/contrib/openbsm/LICENSE
index e05358484ee15..58bd5fa07bb03 100644
--- a/contrib/openbsm/LICENSE
+++ b/contrib/openbsm/LICENSE
@@ -34,5 +34,3 @@ as a whole:
 The TrustedBSD Project would appreciate the contribution of fixes and
 enhancements under an identical license in order to avoid potentially
 confusing license proliferation.
-
-$P4: //depot/projects/trustedbsd/openbsm/LICENSE#6 $
diff --git a/contrib/openbsm/Makefile.am b/contrib/openbsm/Makefile.am
index 50731336e55da..b58c170de2ae7 100644
--- a/contrib/openbsm/Makefile.am
+++ b/contrib/openbsm/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $
-##
-
 SUBDIRS =		\
 	bsm
 
diff --git a/contrib/openbsm/Makefile.in b/contrib/openbsm/Makefile.in
index 9f90493d61763..4e0a8a8ee9d9c 100644
--- a/contrib/openbsm/Makefile.in
+++ b/contrib/openbsm/Makefile.in
@@ -59,9 +59,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(top_srcdir)/config/config.sub \
 	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
 	$(top_srcdir)/config/missing $(top_srcdir)/configure INSTALL \
-	NEWS TODO config/config.guess config/config.sub config/depcomp \
-	config/install-sh config/ltmain.sh config/missing \
-	config/ylwrap
+	NEWS TODO config/compile config/config.guess config/config.sub \
+	config/depcomp config/install-sh config/ltmain.sh \
+	config/missing config/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/contrib/openbsm/NEWS b/contrib/openbsm/NEWS
index a55fabb2362d9..dc49117f75b32 100644
--- a/contrib/openbsm/NEWS
+++ b/contrib/openbsm/NEWS
@@ -1,5 +1,16 @@
 OpenBSM Version History
 
+OpenBSM 1.2 alpha 4
+
+- Fix praudit to emit correct XML.
+- Fix auditdistd bugs related to IPv6 support, locking, and a kqueue-related
+  descriptor leak.
+- Add audit event definitions for Capsicum-related syscalls, as well as
+  AUE_BINDAT and AUE_CONNECTAT.
+- Manpage symlinks for all libbsm functions are installed again after the
+  move to autotools in OpenBSM 1.0 Alpha 5.
+- A variety of minor documentation cleanups.
+
 OpenBSM 1.2 alpha 3
 
 - Various minor tweaks to the auditdistd build to make it fit the FreeBSD
@@ -494,5 +505,3 @@ OpenBSM 1.0 alpha 1
 - auditd(8), audit(8) added to the OpenBSM distribution.  auditd extended
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
-
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $
diff --git a/contrib/openbsm/README b/contrib/openbsm/README
index 17446afddaa82..e60c502849b64 100644
--- a/contrib/openbsm/README
+++ b/contrib/openbsm/README
@@ -1,4 +1,4 @@
-OpenBSM 1.2a2
+OpenBSM
 
   Introduction
 
@@ -10,7 +10,7 @@ of several organizations.
 OpenBSM includes several command line tools, including auditreduce(8) and
 praudit(8) for reducing and printing audit trails, as well as the libbsm(3)
 library to manage configuration files, generate audit records, and parse and
-print audit trils.
+print audit trails.
 
 Coupled with a kernel audit implementation, OpenBSM can be used to maintain
 system audit streams, and is a foundation for a full audit-enabled system.
@@ -64,5 +64,3 @@ Information on OpenBSM may be found on the OpenBSM home page:
 Information on TrustedBSD may be found on the TrustedBSD home page:
 
     http://www.TrustedBSD.org/
-
-$P4: //depot/projects/trustedbsd/openbsm/README#41 $
diff --git a/contrib/openbsm/TODO b/contrib/openbsm/TODO
index 7b8f403f1336f..5928aed42a3e2 100644
--- a/contrib/openbsm/TODO
+++ b/contrib/openbsm/TODO
@@ -7,8 +7,6 @@ OpenBSM TODO
 - Document contents of libbsm "public" data structures in libbsm man pages.
 - The audit.log.5 man page is incomplete, as it does not describe all
   token types.
-- With the move to autoconf/automake, man page symlinks are no longer
-  installed.  This needs to be fixed.
 - It might be desirable to be able to provide EOPNOTSUPP system call stubs
   on systems that don't have the necessary audit system calls; that would
   allow the full libbsm and tool set to build, just not run.
@@ -23,5 +21,3 @@ OpenBSM TODO
   not available on the local OS platform.
 - Support for client certificates in auditdistd, to include certificate chain
   validation.
-
-$P4: //depot/projects/trustedbsd/openbsm/TODO#14 $
diff --git a/contrib/openbsm/VERSION b/contrib/openbsm/VERSION
index b3ea4dc9eef91..da1fd6293c60d 100644
--- a/contrib/openbsm/VERSION
+++ b/contrib/openbsm/VERSION
@@ -1 +1 @@
-OPENBSM_1_2_alpha3
+OPENBSM_1_2_alpha4
diff --git a/contrib/openbsm/autogen.sh b/contrib/openbsm/autogen.sh
index 41fbc31d72468..afa8a03ab4106 100644
--- a/contrib/openbsm/autogen.sh
+++ b/contrib/openbsm/autogen.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $
-#
 
 libtoolize --copy --force
 aclocal
diff --git a/contrib/openbsm/bin/Makefile.am b/contrib/openbsm/bin/Makefile.am
index 16073e982ff1b..15a3dbcee3612 100644
--- a/contrib/openbsm/bin/Makefile.am
+++ b/contrib/openbsm/bin/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $
-##
-
 SUBDIRS =		\
 	auditdistd	\
 	auditfilterd	\
diff --git a/contrib/openbsm/bin/audit/Makefile.am b/contrib/openbsm/bin/audit/Makefile.am
index e7977831fddb9..d0af56c347d96 100644
--- a/contrib/openbsm/bin/audit/Makefile.am
+++ b/contrib/openbsm/bin/audit/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#7 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/bin/audit/audit.8 b/contrib/openbsm/bin/audit/audit.8
index d5b296068dc22..b9f98b328200a 100644
--- a/contrib/openbsm/bin/audit/audit.8
+++ b/contrib/openbsm/bin/audit/audit.8
@@ -25,9 +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/audit/audit.8#16 $
-.\"
-.Dd January 29, 2009
+.Dd July 25, 2015
 .Dt AUDIT 8
 .Os
 .Sh NAME
@@ -88,7 +86,7 @@ Audit policy file used to configure the auditing system.
 .Xr audit 4 ,
 .Xr audit_control 5 ,
 .Xr auditd 8 ,
-.Xr launchd 8
+.Xr launchd 8 (Mac OS X)
 .Sh HISTORY
 The OpenBSM implementation was created by McAfee Research, the security
 division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004.
diff --git a/contrib/openbsm/bin/audit/audit.c b/contrib/openbsm/bin/audit/audit.c
index 95ac3bc44cdbe..dfe956f2e005a 100644
--- a/contrib/openbsm/bin/audit/audit.c
+++ b/contrib/openbsm/bin/audit/audit.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#15 $
  */
 /*
  * Program to trigger the audit daemon with a message that is either:
diff --git a/contrib/openbsm/bin/auditd/Makefile.am b/contrib/openbsm/bin/auditd/Makefile.am
index 2a187db63f6f1..8a2a9dfb3b746 100644
--- a/contrib/openbsm/bin/auditd/Makefile.am
+++ b/contrib/openbsm/bin/auditd/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#6 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/bin/auditd/audit_triggers.defs b/contrib/openbsm/bin/auditd/audit_triggers.defs
index f5b394dd422b6..9fe2c352f5919 100644
--- a/contrib/openbsm/bin/auditd/audit_triggers.defs
+++ b/contrib/openbsm/bin/auditd/audit_triggers.defs
@@ -1,5 +1 @@
-/*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 $
- */
-
 #include <mach/audit_triggers.defs>
diff --git a/contrib/openbsm/bin/auditd/audit_warn.c b/contrib/openbsm/bin/auditd/audit_warn.c
index 22806e24b41c6..6bd2b8477c101 100644
--- a/contrib/openbsm/bin/auditd/audit_warn.c
+++ b/contrib/openbsm/bin/auditd/audit_warn.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#11 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditd/auditd.8 b/contrib/openbsm/bin/auditd/auditd.8
index b4375245a10ce..c76dfcae92ff4 100644
--- a/contrib/openbsm/bin/auditd/auditd.8
+++ b/contrib/openbsm/bin/auditd/auditd.8
@@ -25,9 +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#19 $
-.\"
-.Dd December 11, 2008
+.Dd July 25, 2015
 .Dt AUDITD 8
 .Os
 .Sh NAME
@@ -123,7 +121,7 @@ and are no longer available as arguments to
 .Xr audit_warn 5 ,
 .Xr audit 8 ,
 .Xr auditdistd 8 ,
-.Xr launchd 8
+.Xr launchd 8 (Mac OS X)
 .Sh HISTORY
 The OpenBSM implementation was created by McAfee Research, the security
 division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004.
diff --git a/contrib/openbsm/bin/auditd/auditd.c b/contrib/openbsm/bin/auditd/auditd.c
index 26a0d07c3cd72..a4357bd9c0e1e 100644
--- a/contrib/openbsm/bin/auditd/auditd.c
+++ b/contrib/openbsm/bin/auditd/auditd.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#50 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditd/auditd.h b/contrib/openbsm/bin/auditd/auditd.h
index f952181b33e66..20afd75172cf9 100644
--- a/contrib/openbsm/bin/auditd/auditd.h
+++ b/contrib/openbsm/bin/auditd/auditd.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#13 $
  */
 
 #ifndef _AUDITD_H_
diff --git a/contrib/openbsm/bin/auditd/auditd_control.defs b/contrib/openbsm/bin/auditd/auditd_control.defs
index f06fe017a2ca4..84f37df435b9d 100644
--- a/contrib/openbsm/bin/auditd/auditd_control.defs
+++ b/contrib/openbsm/bin/auditd/auditd_control.defs
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_control.defs#2 $
  */
 
 /*
diff --git a/contrib/openbsm/bin/auditd/auditd_darwin.c b/contrib/openbsm/bin/auditd/auditd_darwin.c
index 8530185e4a90b..702eb9476ce52 100644
--- a/contrib/openbsm/bin/auditd/auditd_darwin.c
+++ b/contrib/openbsm/bin/auditd/auditd_darwin.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#5 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditd/auditd_fbsd.c b/contrib/openbsm/bin/auditd/auditd_fbsd.c
index 2da98755f48e4..d8f040f391a9c 100644
--- a/contrib/openbsm/bin/auditd/auditd_fbsd.c
+++ b/contrib/openbsm/bin/auditd/auditd_fbsd.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#4 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditdistd/Makefile.am b/contrib/openbsm/bin/auditdistd/Makefile.am
index 88f2584d7b303..263cb2d1fdc42 100644
--- a/contrib/openbsm/bin/auditdistd/Makefile.am
+++ b/contrib/openbsm/bin/auditdistd/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/Makefile.am#1 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/bin/auditdistd/auditdistd.8 b/contrib/openbsm/bin/auditdistd/auditdistd.8
index 299cde46237f9..71a65752ed198 100644
--- a/contrib/openbsm/bin/auditdistd/auditdistd.8
+++ b/contrib/openbsm/bin/auditdistd/auditdistd.8
@@ -41,7 +41,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-daemon is responsible for distributing audit trail files over TCP/IP network in
+daemon is responsible for distributing audit trail files over a TCP/IP network in
 a secure and reliable way.
 .Pp
 The
@@ -49,7 +49,7 @@ The
 daemon can be started with the following command line arguments:
 .Bl -tag -width ".Fl P Ar pidfile"
 .It Fl c Ar config
-Specify alternative location of the configuration file.
+Specify an alternative location of the configuration file.
 The default location is
 .Pa /etc/security/auditdistd.conf .
 Note: the configuration file may contain passwords.
@@ -74,7 +74,7 @@ usage message.
 Start in a launchd-friendly mode, ie. do not use
 .Xr daemon 3 .
 .It Fl P Ar pidfile
-Specify alternative location of a file where main process PID will be
+Specify an alternative location of a file where main process PID will be
 stored.
 The default location is
 .Pa /var/run/auditdistd.pid .
diff --git a/contrib/openbsm/bin/auditdistd/auditdistd.c b/contrib/openbsm/bin/auditdistd/auditdistd.c
index 436531db14f21..696f0488b27a7 100644
--- a/contrib/openbsm/bin/auditdistd/auditdistd.c
+++ b/contrib/openbsm/bin/auditdistd/auditdistd.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#3 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 b/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
index 13abb5a5c4c1f..c6ed2b58906b4 100644
--- a/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
+++ b/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 22, 2011
+.Dd July 1, 2015
 .Dt AUDITDISTD.CONF 5
 .Os
 .Sh NAME
@@ -37,19 +37,21 @@
 daemon.
 .Sh DESCRIPTION
 Note: the configuration file may contain passwords.
-Care should be taken to configure proper permissions on this file
-.Li ( eg. 0600 ) .
+Care should be taken to configure proper permissions for this file
+.Li ( e.g., 0600 ) .
 .Pp
-Every line starting with # is treated as comment and ignored.
+Every line starting with
+.Li #
+gets treated as a comment and is ignored.
 .Sh CONFIGURATION FILE SYNTAX
-General syntax of the
+The general syntax of the
 .Nm
-file is following:
-.Bd -literal -offset
+file is as follows:
+.Bd -literal
 ## Global section.
 
 # Our name.
-# The default is first part of the hostname.
+# The default is the first part of the hostname.
 name "<name>"
 
 # Connection timeout.
@@ -71,11 +73,11 @@ sender {
 	# The default is /var/audit/dist.
 	directory "<dir>"
 .\"
-.\"	# Checksum algorithm for data send over the wire.
+.\"	# Checksum algorithm for data sent over the wire.
 .\"	# The default is none.
 .\"	checksum "<algorithm>"
 .\"
-.\"	# Compression algorithm for data send over the wire.
+.\"	# Compression algorithm for data sent over the wire.
 .\"	# The default is none.
 .\"	compression "<algorithm>"
 
@@ -86,7 +88,7 @@ sender {
 		# Optional.
 		source "<addr>"
 
-		# Address of auditdistd receiver.
+		# Address of the auditdistd receiver.
 		# No default. Obligatory.
 		remote "<addr>"
 
@@ -95,7 +97,7 @@ sender {
 		directory "<dir>"
 
 		# Fingerprint of the receiver's public key when using TLS
-		# for connection.
+		# for connections.
 		# Example fingerprint:
 		# SHA256=8F:0A:FC:8A:3D:09:80:AF:D9:AA:38:CC:8A:86:53:E6:8F:B6:1C:55:30:14:D7:F9:AA:8B:3E:73:CD:F5:76:2B
 		fingerprint "<algorithm=hash>"
@@ -103,37 +105,37 @@ sender {
 		# Password used to authenticate in front of the receiver.
 		password "<password>"
 .\"
-.\"		# Checksum algorithm for data send over the wire.
+.\"		# Checksum algorithm for data sent over the wire.
 .\"		# The default is none.
 .\"		checksum "<algorithm>"
 .\"
-.\"		# Compression algorithm for data send over the wire.
+.\"		# Compression algorithm for data sent over the wire.
 .\"		# The default is none.
 .\"		compression "<algorithm>"
 	}
 
-	# Currently local audit trail files can be send only to one remote
+	# Currently local audit trail files can be sent only to one remote
 	# auditdistd receiver, but this can change in the future.
 }
 
 receiver {
 	## Receiver section.
 
-	# Address to listen on. Multiple listen addresses might be specified.
+	# Address to listen on. Multiple listen addresses may be specified.
 	# The defaults are "tcp4://0.0.0.0:7878" and "tcp6://[::]:7878".
 	listen "<addr>"
 
 	# Base directory.
-	# If directory in host section is no absolute, it will be concatenated
-	# with this base directory.
+	# If the directory in the host section is not absolute, it will be
+        # concatenated with this base directory.
 	# The default is "/var/audit/remote".
 	directory "<basedir>"
 
-	# Path to receiver's certificate file.
+	# Path to the receiver's certificate file.
 	# The default is "/etc/security/auditdistd.cert.pem".
 	certfile "<path>"
 
-	# Path to receiver's private key file.
+	# Path to the receiver's private key file.
 	# The default is "/etc/security/auditdistd.key.pem".
 	keyfile "<path>"
 
@@ -158,7 +160,7 @@ receiver {
 .Ed
 .Pp
 Most of the various available configuration parameters are optional.
-If parameter is not defined in the particular section, it will be
+If a parameter is not defined in the particular section, it will be
 inherited from the parent section if possible.
 For example, if the
 .Ic source
@@ -172,14 +174,14 @@ In case the
 section does not define the
 .Ic source
 parameter at all, the default value will be used.
-.Sh CONFIGURATION FILE DESCRIPTION
+.Sh CONFIGURATION OPTION DESCRIPTION
 The following statements are available:
 .Bl -tag -width ".Ic xxxx"
 .It Ic name Aq name
 .Pp
 This host's name.
-It is send to the receiver, so it can properly recognize us if there are
-more than one sender coming from the same IP address.
+It is sent to the receiver, so it can properly recognize us if there are
+multiple senders coming from the same IP address.
 .It Ic timeout Aq seconds
 .Pp
 Connection timeout in seconds.
@@ -198,17 +200,17 @@ The default value is
 Local address to bind to before connecting to the remote
 .Nm auditdistd
 daemon.
-Format is the same as for the
+The format is the same as for the
 .Ic listen
 statement.
 .It Ic directory Aq path
 .Pp
-Directory where to look for audit trail files in case of sender mode or
-directory where to store received audit trail files.
+The directory where to look for audit trail files in case of sender mode, or
+the directory where to store received audit trail files.
 The provided path has to be an absolute path.
-The only exception is when directory is provided in the
+The only exception is when the directory is provided in the
 .Ic receiver
-section, then path provided in the
+section; then the path provided in the
 .Ic host
 subsections can be relative to the directory in the
 .Ic receiver
@@ -229,13 +231,13 @@ subsections in the
 .Ic receiver
 section where
 .Aq name
-is host's name.
+is the host's name.
 .\".It Ic checksum Aq algorithm
 .\".Pp
 .\"Checksum algorithm should be one of the following:
 .\".Bl -tag -width ".Ic sha256"
 .\".It Ic none
-.\"No checksum will be calculated for the data being send over the network.
+.\"No checksum will be calculated for the data being sent over the network.
 .\"This is the default setting.
 .\".It Ic crc32
 .\"CRC32 checksum will be calculated.
@@ -247,30 +249,30 @@ is host's name.
 .\"Compression algorithm should be one of the following:
 .\".Bl -tag -width ".Ic none"
 .\".It Ic none
-.\"Data send over the network will not be compressed.
+.\"Data sent over the network will not be compressed.
 .\"This is the default setting.
 .\".It Ic lzf
 .\"The
 .\".Nm LZF
 .\"algorithm by
 .\".An Marc Alexander Lehmann
-.\"will be used to compress the data send over the network.
+.\"will be used to compress the data sent over the network.
 .\".Nm LZF
-.\"is very fast, general purpose compression algorithm.
+.\"is a very fast, general purpose compression algorithm.
 .\".El
 .It Ic remote Aq addr
 .Pp
 Address of the remote
 .Nm auditdistd
 daemon.
-Format is the same as for the
+The format is the same as for the
 .Ic listen
 statement.
-When operating in the
+When operating in
 .Ic sender
 mode this address will be used to connect to the
 .Ic receiver .
-When operating in the
+When operating in
 .Ic receiver
 mode only connections from this address will be accepted.
 .It Ic listen Aq addr
@@ -296,21 +298,22 @@ By default
 listens on
 .Pa tcp4://0.0.0.0:7878
 and
-.Pa tcp6://[::]:7878
-if kernel supports IPv4 and IPv6 respectively.
+.Pa tcp6://[::]:7878 ,
+if the kernel supports IPv4 and IPv6 respectively.
 .It Ic keyfile Aq path
 .Pp
-Path to a file that contains private key for TLS communication.
+Path to a file that contains the private key for TLS communication.
 .It Ic certfile Aq path
 .Pp
-Path to a file that contains certificate for TLS communication.
+Path to a file that contains the certificate for TLS communication.
 .It Ic fingerprint Aq algo=hash
 .Pp
-Finger print of the receiver's public key.
-Currently only SHA256 algorithm is supported.
-Certificate public key's fingerprint ready to be pasted into auditdistd
+Fingerprint of the receiver's public key.
+Currently only the SHA256 algorithm is supported.
+The certificate public key's fingerprint ready to be pasted into the
+.Nm auditdistd
 configuration file can be obtained by running:
-.Bd -literal -offset
+.Bd -literal
 # openssl x509 -in /etc/security/auditdistd.cert.pem -noout -fingerprint -sha256 | awk -F '[ =]' '{printf("%s=%s\\n", $1, $3)}'
 .Ed
 .It Ic password Aq password
@@ -352,10 +355,10 @@ receiver {
 .Ed
 .Sh SEE ALSO
 .Xr audit 4 ,
-.Xr auditdistd 8 .
+.Xr auditdistd 8
 .Sh AUTHORS
 The
 .Nm auditdistd
-was developed by
+daemon was developed by
 .An Pawel Jakub Dawidek Aq pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/contrib/openbsm/bin/auditdistd/auditdistd.h b/contrib/openbsm/bin/auditdistd/auditdistd.h
index 9ac2850a7f8bb..d0594f2ebcd89 100644
--- a/contrib/openbsm/bin/auditdistd/auditdistd.h
+++ b/contrib/openbsm/bin/auditdistd/auditdistd.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.h#2 $
  */
 
 #ifndef	_AUDITDISTD_H_
diff --git a/contrib/openbsm/bin/auditdistd/faccessat.h b/contrib/openbsm/bin/auditdistd/faccessat.h
index 37d8b89d87a31..568a6b7f0ab83 100644
--- a/contrib/openbsm/bin/auditdistd/faccessat.h
+++ b/contrib/openbsm/bin/auditdistd/faccessat.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/faccessat.h#1 $
  */
 
 #ifndef	_FACCESSAT_H_
diff --git a/contrib/openbsm/bin/auditdistd/fstatat.h b/contrib/openbsm/bin/auditdistd/fstatat.h
index a2716b97629ea..5327a7c28ad6f 100644
--- a/contrib/openbsm/bin/auditdistd/fstatat.h
+++ b/contrib/openbsm/bin/auditdistd/fstatat.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/fstatat.h#1 $
  */
 
 #ifndef	_FSTATAT_H_
diff --git a/contrib/openbsm/bin/auditdistd/openat.h b/contrib/openbsm/bin/auditdistd/openat.h
index defb947465085..1d9801466cb9b 100644
--- a/contrib/openbsm/bin/auditdistd/openat.h
+++ b/contrib/openbsm/bin/auditdistd/openat.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/openat.h#1 $
  */
 
 #ifndef	_OPENAT_H_
diff --git a/contrib/openbsm/bin/auditdistd/parse.y b/contrib/openbsm/bin/auditdistd/parse.y
index fbe1000f82b2c..1f80d5054ffff 100644
--- a/contrib/openbsm/bin/auditdistd/parse.y
+++ b/contrib/openbsm/bin/auditdistd/parse.y
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#5 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/pjdlog.c b/contrib/openbsm/bin/auditdistd/pjdlog.c
index e8d5876dfcd3f..16f176ecb5237 100644
--- a/contrib/openbsm/bin/auditdistd/pjdlog.c
+++ b/contrib/openbsm/bin/auditdistd/pjdlog.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.c#1 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditdistd/pjdlog.h b/contrib/openbsm/bin/auditdistd/pjdlog.h
index 0cb61217069c3..d6f217f23c24f 100644
--- a/contrib/openbsm/bin/auditdistd/pjdlog.h
+++ b/contrib/openbsm/bin/auditdistd/pjdlog.h
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.h#1 $
  */
 
 #ifndef	_PJDLOG_H_
diff --git a/contrib/openbsm/bin/auditdistd/proto.c b/contrib/openbsm/bin/auditdistd/proto.c
index 25daf0ccb0db0..4e9bea08354b9 100644
--- a/contrib/openbsm/bin/auditdistd/proto.c
+++ b/contrib/openbsm/bin/auditdistd/proto.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.c#1 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditdistd/proto.h b/contrib/openbsm/bin/auditdistd/proto.h
index 79047b0bc80fa..f26c0ad4699bf 100644
--- a/contrib/openbsm/bin/auditdistd/proto.h
+++ b/contrib/openbsm/bin/auditdistd/proto.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.h#1 $
  */
 
 #ifndef	_PROTO_H_
diff --git a/contrib/openbsm/bin/auditdistd/proto_common.c b/contrib/openbsm/bin/auditdistd/proto_common.c
index 0fa4d3c5443b6..acd2294e2d938 100644
--- a/contrib/openbsm/bin/auditdistd/proto_common.c
+++ b/contrib/openbsm/bin/auditdistd/proto_common.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_common.c#1 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditdistd/proto_impl.h b/contrib/openbsm/bin/auditdistd/proto_impl.h
index c2ce2d91e9e24..7915ee91b528e 100644
--- a/contrib/openbsm/bin/auditdistd/proto_impl.h
+++ b/contrib/openbsm/bin/auditdistd/proto_impl.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_impl.h#1 $
  */
 
 #ifndef	_PROTO_IMPL_H_
diff --git a/contrib/openbsm/bin/auditdistd/proto_socketpair.c b/contrib/openbsm/bin/auditdistd/proto_socketpair.c
index 8d04c49217e29..fc65c762b088c 100644
--- a/contrib/openbsm/bin/auditdistd/proto_socketpair.c
+++ b/contrib/openbsm/bin/auditdistd/proto_socketpair.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_socketpair.c#1 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/bin/auditdistd/proto_tcp.c b/contrib/openbsm/bin/auditdistd/proto_tcp.c
index 74d5cd45c5020..465221dfe5cc3 100644
--- a/contrib/openbsm/bin/auditdistd/proto_tcp.c
+++ b/contrib/openbsm/bin/auditdistd/proto_tcp.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/proto_tls.c b/contrib/openbsm/bin/auditdistd/proto_tls.c
index faeb3d8882dea..de89147823cf1 100644
--- a/contrib/openbsm/bin/auditdistd/proto_tls.c
+++ b/contrib/openbsm/bin/auditdistd/proto_tls.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/proto_uds.c b/contrib/openbsm/bin/auditdistd/proto_uds.c
index 3b3dfb7bbacbe..3168bbf890b6a 100644
--- a/contrib/openbsm/bin/auditdistd/proto_uds.c
+++ b/contrib/openbsm/bin/auditdistd/proto_uds.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 $
  */
 
 /* UDS - UNIX Domain Socket */
diff --git a/contrib/openbsm/bin/auditdistd/receiver.c b/contrib/openbsm/bin/auditdistd/receiver.c
index 698619d47326a..9dc3b0184c63b 100644
--- a/contrib/openbsm/bin/auditdistd/receiver.c
+++ b/contrib/openbsm/bin/auditdistd/receiver.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#3 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/renameat.h b/contrib/openbsm/bin/auditdistd/renameat.h
index a6a67f8513db0..0becb8a586998 100644
--- a/contrib/openbsm/bin/auditdistd/renameat.h
+++ b/contrib/openbsm/bin/auditdistd/renameat.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/renameat.h#1 $
  */
 
 #ifndef	_RENAMEAT_H_
diff --git a/contrib/openbsm/bin/auditdistd/sandbox.c b/contrib/openbsm/bin/auditdistd/sandbox.c
index 9e4f13466053a..53cd6b372307c 100644
--- a/contrib/openbsm/bin/auditdistd/sandbox.c
+++ b/contrib/openbsm/bin/auditdistd/sandbox.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#3 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/sandbox.h b/contrib/openbsm/bin/auditdistd/sandbox.h
index 2dc59e4b03650..7bcde25557d8d 100644
--- a/contrib/openbsm/bin/auditdistd/sandbox.h
+++ b/contrib/openbsm/bin/auditdistd/sandbox.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.h#1 $
  */
 
 #ifndef	_SANDBOX_H_
diff --git a/contrib/openbsm/bin/auditdistd/sender.c b/contrib/openbsm/bin/auditdistd/sender.c
index ec3702e880dcf..4349b0f54cc95 100644
--- a/contrib/openbsm/bin/auditdistd/sender.c
+++ b/contrib/openbsm/bin/auditdistd/sender.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#3 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/sigtimedwait.h b/contrib/openbsm/bin/auditdistd/sigtimedwait.h
index 187c6d6dec1b2..06a4d130e8b13 100644
--- a/contrib/openbsm/bin/auditdistd/sigtimedwait.h
+++ b/contrib/openbsm/bin/auditdistd/sigtimedwait.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sigtimedwait.h#2 $
  */
 
 #ifndef	_SIGTIMEDWAIT_H_
diff --git a/contrib/openbsm/bin/auditdistd/strndup.h b/contrib/openbsm/bin/auditdistd/strndup.h
index 6cf3c95258d28..c36a950e21e8d 100644
--- a/contrib/openbsm/bin/auditdistd/strndup.h
+++ b/contrib/openbsm/bin/auditdistd/strndup.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/strndup.h#1 $
  */
 
 #ifndef	_STRNDUP_H_
diff --git a/contrib/openbsm/bin/auditdistd/subr.c b/contrib/openbsm/bin/auditdistd/subr.c
index 0f531cc22d0dc..ecc626cc9734d 100644
--- a/contrib/openbsm/bin/auditdistd/subr.c
+++ b/contrib/openbsm/bin/auditdistd/subr.c
@@ -22,8 +22,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#3 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/subr.h b/contrib/openbsm/bin/auditdistd/subr.h
index 2f11b65004c82..7e2ddeb2a7f9a 100644
--- a/contrib/openbsm/bin/auditdistd/subr.h
+++ b/contrib/openbsm/bin/auditdistd/subr.h
@@ -22,8 +22,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.h#1 $
  */
 
 #ifndef	_AUDITDISTD_SUBR_H_
diff --git a/contrib/openbsm/bin/auditdistd/synch.h b/contrib/openbsm/bin/auditdistd/synch.h
index e6fe19d1c6245..6d83a9bbd7bde 100644
--- a/contrib/openbsm/bin/auditdistd/synch.h
+++ b/contrib/openbsm/bin/auditdistd/synch.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#3 $
  */
 
 #ifndef	_SYNCH_H_
diff --git a/contrib/openbsm/bin/auditdistd/token.l b/contrib/openbsm/bin/auditdistd/token.l
index f459013a44536..e3c4624e6fb8e 100644
--- a/contrib/openbsm/bin/auditdistd/token.l
+++ b/contrib/openbsm/bin/auditdistd/token.l
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/trail.c b/contrib/openbsm/bin/auditdistd/trail.c
index d4be51eeed367..b8a9881c1ba54 100644
--- a/contrib/openbsm/bin/auditdistd/trail.c
+++ b/contrib/openbsm/bin/auditdistd/trail.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#3 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/bin/auditdistd/trail.h b/contrib/openbsm/bin/auditdistd/trail.h
index 33c88b28d6656..204ea2b317a33 100644
--- a/contrib/openbsm/bin/auditdistd/trail.h
+++ b/contrib/openbsm/bin/auditdistd/trail.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.h#1 $
  */
 
 #ifndef	_AUDITDISTD_TRAIL_H_
diff --git a/contrib/openbsm/bin/auditdistd/unlinkat.h b/contrib/openbsm/bin/auditdistd/unlinkat.h
index ee9c023ba4643..6364208fcb9ee 100644
--- a/contrib/openbsm/bin/auditdistd/unlinkat.h
+++ b/contrib/openbsm/bin/auditdistd/unlinkat.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/unlinkat.h#1 $
  */
 
 #ifndef	_UNLINKAT_H_
diff --git a/contrib/openbsm/bin/auditfilterd/Makefile.am b/contrib/openbsm/bin/auditfilterd/Makefile.am
index 81d4fb5cc5215..400a1d9c2a1e8 100644
--- a/contrib/openbsm/bin/auditfilterd/Makefile.am
+++ b/contrib/openbsm/bin/auditfilterd/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#4 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/bin/auditfilterd/auditfilterd.8 b/contrib/openbsm/bin/auditfilterd/auditfilterd.8
index 034c81bb317ad..f78c6640accff 100644
--- a/contrib/openbsm/bin/auditfilterd/auditfilterd.8
+++ b/contrib/openbsm/bin/auditfilterd/auditfilterd.8
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#6 $
-.\"
 .Dd October 3, 2006
 .Dt AUDITFILTERD 8
 .Os
diff --git a/contrib/openbsm/bin/auditfilterd/auditfilterd.c b/contrib/openbsm/bin/auditfilterd/auditfilterd.c
index ba42834b341e6..46c86b2eba967 100644
--- a/contrib/openbsm/bin/auditfilterd/auditfilterd.c
+++ b/contrib/openbsm/bin/auditfilterd/auditfilterd.c
@@ -24,8 +24,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 $
  */
 
 /*
@@ -131,7 +129,7 @@ present_rawrecord(struct timespec *ts, u_char *data, u_int len)
 }
 
 /*
- * Parse the BSM into a set of tokens, which will be pased to registered
+ * Parse the BSM into a set of tokens, which will be passed to registered
  * and interested filters.
  */
 #define	MAX_TOKENS	128	/* Maximum tokens we handle per record. */
diff --git a/contrib/openbsm/bin/auditfilterd/auditfilterd.h b/contrib/openbsm/bin/auditfilterd/auditfilterd.h
index d55aeee9f5804..c178b82b96c93 100644
--- a/contrib/openbsm/bin/auditfilterd/auditfilterd.h
+++ b/contrib/openbsm/bin/auditfilterd/auditfilterd.h
@@ -24,8 +24,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#5 $
  */
 
 #define	AUDITFILTERD_CONFFILE	"/etc/security/audit_filter"
diff --git a/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c b/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
index b0642fa4d7612..bf3b3bb5550dc 100644
--- a/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
+++ b/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
@@ -24,8 +24,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#5 $
  */
 
 /*
diff --git a/contrib/openbsm/bin/auditreduce/Makefile.am b/contrib/openbsm/bin/auditreduce/Makefile.am
index a02178b2766b7..b5e24338eb46e 100644
--- a/contrib/openbsm/bin/auditreduce/Makefile.am
+++ b/contrib/openbsm/bin/auditreduce/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#4 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/bin/auditreduce/auditreduce.1 b/contrib/openbsm/bin/auditreduce/auditreduce.1
index 157f31d12aa7e..3266ad9bc160f 100644
--- a/contrib/openbsm/bin/auditreduce/auditreduce.1
+++ b/contrib/openbsm/bin/auditreduce/auditreduce.1
@@ -25,8 +25,6 @@
 .\" 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/auditreduce/auditreduce.1#18 $
-.\"
 .Dd January 24, 2004
 .Dt AUDITREDUCE 1
 .Os
diff --git a/contrib/openbsm/bin/auditreduce/auditreduce.c b/contrib/openbsm/bin/auditreduce/auditreduce.c
index 0faadda23f9e9..f73d341c01100 100644
--- a/contrib/openbsm/bin/auditreduce/auditreduce.c
+++ b/contrib/openbsm/bin/auditreduce/auditreduce.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#31 $
  */
 
 /* 
diff --git a/contrib/openbsm/bin/auditreduce/auditreduce.h b/contrib/openbsm/bin/auditreduce/auditreduce.h
index 5f548935453ad..655b45d217798 100644
--- a/contrib/openbsm/bin/auditreduce/auditreduce.h
+++ b/contrib/openbsm/bin/auditreduce/auditreduce.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#7 $
  */
 
 #ifndef _AUDITREDUCE_H_
diff --git a/contrib/openbsm/bin/praudit/Makefile.am b/contrib/openbsm/bin/praudit/Makefile.am
index c28afd4758a2f..4643b7c77a71d 100644
--- a/contrib/openbsm/bin/praudit/Makefile.am
+++ b/contrib/openbsm/bin/praudit/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#4 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/bin/praudit/praudit.1 b/contrib/openbsm/bin/praudit/praudit.1
index 99ea7c81774f6..2954ba3da029b 100644
--- a/contrib/openbsm/bin/praudit/praudit.1
+++ b/contrib/openbsm/bin/praudit/praudit.1
@@ -25,8 +25,6 @@
 .\" 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.1#14 $
-.\"
 .Dd August 4, 2009
 .Dt PRAUDIT 1
 .Os
diff --git a/contrib/openbsm/bin/praudit/praudit.c b/contrib/openbsm/bin/praudit/praudit.c
index f20f245ec02ef..f7954344b15a3 100644
--- a/contrib/openbsm/bin/praudit/praudit.c
+++ b/contrib/openbsm/bin/praudit/praudit.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#16 $
  */
 
 /*
diff --git a/contrib/openbsm/bsm/Makefile.am b/contrib/openbsm/bsm/Makefile.am
index c36d576f9faa9..c3df79ebe9758 100644
--- a/contrib/openbsm/bsm/Makefile.am
+++ b/contrib/openbsm/bsm/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#5 $
-##
-
 openbsmdir = $(includedir)/bsm
 
 openbsm_HEADERS =		\
diff --git a/contrib/openbsm/bsm/audit_filter.h b/contrib/openbsm/bsm/audit_filter.h
index 8a548f797fa73..b751ba8080dee 100644
--- a/contrib/openbsm/bsm/audit_filter.h
+++ b/contrib/openbsm/bsm/audit_filter.h
@@ -24,8 +24,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#4 $
  */
 
 #ifndef _BSM_AUDIT_FILTER_H_
diff --git a/contrib/openbsm/bsm/audit_uevents.h b/contrib/openbsm/bsm/audit_uevents.h
index f71797b5b318b..d9dacde18e471 100644
--- a/contrib/openbsm/bsm/audit_uevents.h
+++ b/contrib/openbsm/bsm/audit_uevents.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#11 $
  */
 
 #ifndef _BSM_AUDIT_UEVENTS_H_
diff --git a/contrib/openbsm/bsm/auditd_lib.h b/contrib/openbsm/bsm/auditd_lib.h
index fb3ca36216e6d..926ca037ec63b 100644
--- a/contrib/openbsm/bsm/auditd_lib.h
+++ b/contrib/openbsm/bsm/auditd_lib.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#5 $
  */
 
 #ifndef _BSM_AUDITD_LIB_H_
diff --git a/contrib/openbsm/bsm/libbsm.h b/contrib/openbsm/bsm/libbsm.h
index 5e92583518394..efaf8505708f2 100644
--- a/contrib/openbsm/bsm/libbsm.h
+++ b/contrib/openbsm/bsm/libbsm.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#50 $
  */
 
 #ifndef _LIBBSM_H_
diff --git a/contrib/openbsm/compat/clock_gettime.h b/contrib/openbsm/compat/clock_gettime.h
index ad9315fd32361..7492b16c331c9 100644
--- a/contrib/openbsm/compat/clock_gettime.h
+++ b/contrib/openbsm/compat/clock_gettime.h
@@ -22,8 +22,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/compat/clock_gettime.h#3 $
  */
 
 /*
diff --git a/contrib/openbsm/compat/closefrom.h b/contrib/openbsm/compat/closefrom.h
index b0545f352a8ca..fdfcfcf19743c 100644
--- a/contrib/openbsm/compat/closefrom.h
+++ b/contrib/openbsm/compat/closefrom.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/compat/closefrom.h#1 $
  */
 
 #ifndef	_CLOSEFROM_H_
diff --git a/contrib/openbsm/compat/compat.h b/contrib/openbsm/compat/compat.h
index 5cd7446e0a6c0..e3c4d355a183f 100644
--- a/contrib/openbsm/compat/compat.h
+++ b/contrib/openbsm/compat/compat.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/compat/compat.h#1 $
  */
 
 #ifndef	_COMPAT_H_
diff --git a/contrib/openbsm/compat/endian.h b/contrib/openbsm/compat/endian.h
index d01c7d4b23404..b4961d5a24ca9 100644
--- a/contrib/openbsm/compat/endian.h
+++ b/contrib/openbsm/compat/endian.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD src/sys/sys/endian.h:1.6.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#10 $
  */
 
 #ifndef _COMPAT_ENDIAN_H_
diff --git a/contrib/openbsm/compat/endian_enc.h b/contrib/openbsm/compat/endian_enc.h
index 9e671b7666076..c131e43ea83d7 100644
--- a/contrib/openbsm/compat/endian_enc.h
+++ b/contrib/openbsm/compat/endian_enc.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD src/sys/sys/endian.h:1.6.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/endian_enc.h#1 $
  */
 
 #ifndef _COMPAT_ENDIAN_ENC_H_
diff --git a/contrib/openbsm/compat/flopen.h b/contrib/openbsm/compat/flopen.h
index c68f4a2aded8e..7871b13c183ff 100644
--- a/contrib/openbsm/compat/flopen.h
+++ b/contrib/openbsm/compat/flopen.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD head/lib/libutil/flopen.c r193591
- * $P4: //depot/projects/trustedbsd/openbsm/compat/flopen.h#1 $
  */
 
 #include <sys/file.h>
diff --git a/contrib/openbsm/compat/pidfile.h b/contrib/openbsm/compat/pidfile.h
index c3a259ba08019..5286b6999b29b 100644
--- a/contrib/openbsm/compat/pidfile.h
+++ b/contrib/openbsm/compat/pidfile.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD head/lib/libutil/pidfile.c r231938
- * $P4: //depot/projects/trustedbsd/openbsm/compat/pidfile.h#1 $
  */
 
 #include <sys/param.h>
diff --git a/contrib/openbsm/compat/queue.h b/contrib/openbsm/compat/queue.h
index a73a1f7ad83b5..4236e62c596e9 100644
--- a/contrib/openbsm/compat/queue.h
+++ b/contrib/openbsm/compat/queue.h
@@ -29,7 +29,6 @@
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
  *
  * Derived from FreeBSD src/sys/sys/queue.h:1.63.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#3 $
  */
 
 #ifndef _COMPAT_QUEUE_H_
diff --git a/contrib/openbsm/compat/strlcat.h b/contrib/openbsm/compat/strlcat.h
index f10109bb189a1..70a851c9a9237 100644
--- a/contrib/openbsm/compat/strlcat.h
+++ b/contrib/openbsm/compat/strlcat.h
@@ -25,7 +25,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * dollar OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp dollar
- * $P4: //depot/projects/trustedbsd/openbsm/compat/strlcat.h#3 $
  */
 
 /*
diff --git a/contrib/openbsm/compat/strlcpy.h b/contrib/openbsm/compat/strlcpy.h
index 2f6455d12e9fd..1d206b6eac1a0 100644
--- a/contrib/openbsm/compat/strlcpy.h
+++ b/contrib/openbsm/compat/strlcpy.h
@@ -25,7 +25,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * dollar OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp dollar
- * $P4: //depot/projects/trustedbsd/openbsm/compat/strlcpy.h#1 $
  */
 
 /*
diff --git a/contrib/openbsm/configure b/contrib/openbsm/configure
index 197a9bec82592..14ae32067622e 100755
--- a/contrib/openbsm/configure
+++ b/contrib/openbsm/configure
@@ -1,9 +1,8 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3.
+# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha4.
 #
-# Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
+# Report bugs to <trustedbsd-audit@TrustedBSD.org>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -276,7 +275,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: trustedbsd-audit@TrustesdBSD.org about your system,
+$0: trustedbsd-audit@TrustedBSD.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -591,9 +590,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenBSM'
 PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.2-alpha3'
-PACKAGE_STRING='OpenBSM 1.2-alpha3'
-PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org'
+PACKAGE_VERSION='1.2-alpha4'
+PACKAGE_STRING='OpenBSM 1.2-alpha4'
+PACKAGE_BUGREPORT='trustedbsd-audit@TrustedBSD.org'
 PACKAGE_URL=''
 
 ac_unique_file="bin/auditreduce/auditreduce.c"
@@ -1327,7 +1326,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.2-alpha4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";;
+     short | recursive ) echo "Configuration of OpenBSM 1.2-alpha4:";;
    esac
   cat <<\_ACEOF
 
@@ -1448,7 +1447,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
+Report bugs to <trustedbsd-audit@TrustedBSD.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1511,7 +1510,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenBSM configure 1.2-alpha3
+OpenBSM configure 1.2-alpha4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1856,9 +1855,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------------- ##
-## Report this to trustedbsd-audit@TrustesdBSD.org ##
-## ----------------------------------------------- ##"
+( $as_echo "## ---------------------------------------------- ##
+## Report this to trustedbsd-audit@TrustedBSD.org ##
+## ---------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -1991,7 +1990,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenBSM $as_me 1.2-alpha3, which was
+It was created by OpenBSM $as_me 1.2-alpha4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2344,7 +2343,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
   if test -f "$ac_dir/install-sh"; then
@@ -11132,6 +11130,17 @@ CC="$lt_save_CC"
 # Only expand once:
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
 for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -11552,7 +11561,7 @@ fi
 # Define the identity of the package.
 
  PACKAGE=OpenBSM
- VERSION=1.2-alpha3
+ VERSION=1.2-alpha4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14174,7 +14183,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenBSM $as_me 1.2-alpha3, which was
+This file was extended by OpenBSM $as_me 1.2-alpha4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14234,13 +14243,13 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <trustedbsd-audit@TrustesdBSD.org>."
+Report bugs to <trustedbsd-audit@TrustedBSD.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenBSM config.status 1.2-alpha3
+OpenBSM config.status 1.2-alpha4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/contrib/openbsm/configure.ac b/contrib/openbsm/configure.ac
index d1764879ec177..19762e4517e75 100644
--- a/contrib/openbsm/configure.ac
+++ b/contrib/openbsm/configure.ac
@@ -2,8 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.2-alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $])
+AC_INIT([OpenBSM], [1.2-alpha4], [trustedbsd-audit@TrustedBSD.org],[openbsm])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
@@ -29,6 +28,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LEX
 AC_PROG_LIBTOOL
+AC_PROG_LN_S
 AC_PROG_YACC
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class
index 9e020ebbd6242..47868b17d5da8 100644
--- a/contrib/openbsm/etc/audit_class
+++ b/contrib/openbsm/etc/audit_class
@@ -1,5 +1,4 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#6 $
 # $FreeBSD$
 #
 0x00000000:no:invalid class
diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control
index 10817084b87be..d71b9a8174526 100644
--- a/contrib/openbsm/etc/audit_control
+++ b/contrib/openbsm/etc/audit_control
@@ -1,5 +1,4 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#9 $
 # $FreeBSD$
 #
 dir:/var/audit
diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event
index b4596b0c6cbf8..b7d4cba3303a7 100644
--- a/contrib/openbsm/etc/audit_event
+++ b/contrib/openbsm/etc/audit_event
@@ -1,5 +1,4 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $
 # $FreeBSD$
 #
 # The mapping between event identifiers and values is also hard-coded in
diff --git a/contrib/openbsm/etc/audit_filter b/contrib/openbsm/etc/audit_filter
index 64f5c0e04d946..d0dc1c0baa5c5 100644
--- a/contrib/openbsm/etc/audit_filter
+++ b/contrib/openbsm/etc/audit_filter
@@ -1,5 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_filter#1 $
+# $FreeBSD$
 #
 # modulename:various arguments here
 #
diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user
index 0cce4f1974397..035066228e916 100644
--- a/contrib/openbsm/etc/audit_user
+++ b/contrib/openbsm/etc/audit_user
@@ -1,5 +1,4 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#3 $
 # $FreeBSD$
 #
 root:lo:no
diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn
index c5a31590fc8dc..4b8498ea41448 100644
--- a/contrib/openbsm/etc/audit_warn
+++ b/contrib/openbsm/etc/audit_warn
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $
 # $FreeBSD$
 #
+
 logger -p security.warning "audit warning: $@"
diff --git a/contrib/openbsm/libauditd/Makefile.am b/contrib/openbsm/libauditd/Makefile.am
index 3a4e7abdc7b02..c6e09aa4d8a57 100644
--- a/contrib/openbsm/libauditd/Makefile.am
+++ b/contrib/openbsm/libauditd/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#3 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/libauditd/auditd_lib.c b/contrib/openbsm/libauditd/auditd_lib.c
index 3c033487fafd6..6079df05318e4 100644
--- a/contrib/openbsm/libauditd/auditd_lib.c
+++ b/contrib/openbsm/libauditd/auditd_lib.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#18 $
  */
 
 #include <sys/param.h>
@@ -402,12 +400,13 @@ trailname_to_tstamp(char *fn, time_t *tstamp)
  *	ADE_NOERR	on success or there is nothing to do.
  *	ADE_PARSE	if error parsing audit_control(5).
  *	ADE_NOMEM	if could not allocate memory.
- *	ADE_EXPIRE	if there was an unespected error.
+ *	ADE_READLINK	if could not read link file.
+ *	ADE_EXPIRE	if there was an unexpected error.
  */
 int
 auditd_expire_trails(int (*warn_expired)(char *))
 {
-	int andflg, ret = ADE_NOERR;
+	int andflg, len, ret = ADE_NOERR;
 	size_t expire_size, total_size = 0L;
 	time_t expire_age, oldest_time, current_time = time(NULL);
 	struct dir_ent *traildir;
@@ -431,7 +430,9 @@ auditd_expire_trails(int (*warn_expired)(char *))
 	 * Read the 'current' trail file name.  Trim off directory path.
 	 */
 	activefn[0] = '\0';
-	readlink(AUDIT_CURRENT_LINK, activefn, MAXPATHLEN - 1);
+	len = readlink(AUDIT_CURRENT_LINK, activefn, MAXPATHLEN - 1);
+	if (len < 0)
+		return (ADE_READLINK);
 	if ((afnp = strrchr(activefn, '/')) != NULL)
 		afnp++;
 
diff --git a/contrib/openbsm/libauditd/libauditd.3 b/contrib/openbsm/libauditd/libauditd.3
index 0fece29b3d678..06c524606a2c6 100644
--- a/contrib/openbsm/libauditd/libauditd.3
+++ b/contrib/openbsm/libauditd/libauditd.3
@@ -26,8 +26,6 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libauditd/libauditd.3#1 $
-.\"
 .Dd December 27, 2008
 .Dt LIBAUDITD 3
 .Os
@@ -45,7 +43,7 @@ library provides the internal implementation of
 There are no public interfaces in
 .Nm .
 .Sh SEE ALSO
-.Xr auditd 8 .
+.Xr auditd 8
 .Sh HISTORY
 The OpenBSM implementation was created by McAfee Research, the security
 division of McAfee Inc., under contract to Apple Computer, Inc., in 2004.
diff --git a/contrib/openbsm/libbsm/Makefile.am b/contrib/openbsm/libbsm/Makefile.am
index bfad93b5a735a..278f22883105b 100644
--- a/contrib/openbsm/libbsm/Makefile.am
+++ b/contrib/openbsm/libbsm/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#10 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
@@ -41,9 +37,121 @@ man3_MANS =		\
 	au_free_token.3	\
 	au_io.3		\
 	au_mask.3	\
+	au_notify.3	\
 	au_open.3	\
 	au_socket_type.3	\
 	au_token.3	\
 	au_user.3	\
 	libbsm.3
 
+install-exec-hook:
+	cd $(DESTDIR)$(mandir) && \
+	  $(LN_S) -f au_class.3 getauclassent.3 && \
+	  $(LN_S) -f au_class.3 getauclassent_r.3 && \
+	  $(LN_S) -f au_class.3 getauclassnam.3 && \
+	  $(LN_S) -f au_class.3 getauclassnam_r.3 && \
+	  $(LN_S) -f au_class.3 setauclass.3 && \
+	  $(LN_S) -f au_class.3 endauclass.3 && \
+	  $(LN_S) -f au_control.3 setac.3 && \
+	  $(LN_S) -f au_control.3 endac.3 && \
+	  $(LN_S) -f au_control.3 getacdir.3 && \
+	  $(LN_S) -f au_control.3 getacdist.3 && \
+	  $(LN_S) -f au_control.3 getacexpire.3 && \
+	  $(LN_S) -f au_control.3 getacfilesz.3 && \
+	  $(LN_S) -f au_control.3 getacflg.3 && \
+	  $(LN_S) -f au_control.3 getachost.3 && \
+	  $(LN_S) -f au_control.3 getacmin.3 && \
+	  $(LN_S) -f au_control.3 getacna.3 && \
+	  $(LN_S) -f au_control.3 getacpol.3 && \
+	  $(LN_S) -f au_control.3 au_poltostr.3 && \
+	  $(LN_S) -f au_control.3 ac_strtopol.3 && \
+	  $(LN_S) -f au_domain.3 au_bsm_to_domain.3 && \
+	  $(LN_S) -f au_domain.3 au_domain_to_bsm.3 && \
+	  $(LN_S) -f au_errno.3 au_bsm_to_errno.3 && \
+	  $(LN_S) -f au_errno.3 au_errno_to_bsm.3 && \
+	  $(LN_S) -f au_errno.3 au_strerror.3 && \
+	  $(LN_S) -f au_event.3 setauevent.3 && \
+	  $(LN_S) -f au_event.3 endauevent.3 && \
+	  $(LN_S) -f au_event.3 getauevent.3 && \
+	  $(LN_S) -f au_event.3 getauevent_r.3 && \
+	  $(LN_S) -f au_event.3 getauevnam.3 && \
+	  $(LN_S) -f au_event.3 getauevnam_r.3 && \
+	  $(LN_S) -f au_event.3 getauevnum.3 && \
+	  $(LN_S) -f au_event.3 getauevnum_r.3 && \
+	  $(LN_S) -f au_event.3 getauevnonam.3 && \
+	  $(LN_S) -f au_event.3 getauevnonam_r.3 && \
+	  $(LN_S) -f au_fcntl.3 au_bsm_to_fcntl_cmd.3 && \
+	  $(LN_S) -f au_fcntl.3 au_fcntl_cmd_to_bsm.3 && \
+	  $(LN_S) -f au_io.3 au_fetch_tok.3 && \
+	  $(LN_S) -f au_io.3 au_print_tok.3 && \
+	  $(LN_S) -f au_io.3 au_print_flags_tok.3 && \
+	  $(LN_S) -f au_io.3 au_read_rec.3 && \
+	  $(LN_S) -f au_mask.3 au_preselect.3 && \
+	  $(LN_S) -f au_mask.3 getauditflagsbin.3 && \
+	  $(LN_S) -f au_mask.3 getauditflagschar.3 && \
+	  $(LN_S) -f au_notify.3 au_get_state.3 && \
+	  $(LN_S) -f au_notify.3 au_notify_initialize.3 && \
+	  $(LN_S) -f au_notify.3 au_notify_terminate.3 && \
+	  $(LN_S) -f au_open.3 au_open.3 && \
+	  $(LN_S) -f au_open.3 au_write.3 && \
+	  $(LN_S) -f au_open.3 au_close.3 && \
+	  $(LN_S) -f au_open.3 au_close_buffer.3 && \
+	  $(LN_S) -f au_open.3 au_close_token.3 && \
+	  $(LN_S) -f au_socket_type.3 au_bsm_to_socket_type.3 && \
+	  $(LN_S) -f au_socket_type.3 au_socket_type_to_bsm.3 && \
+	  $(LN_S) -f au_token.3 au_to_arg32.3 && \
+	  $(LN_S) -f au_token.3 au_to_arg64.3 && \
+	  $(LN_S) -f au_token.3 au_to_arg.3 && \
+	  $(LN_S) -f au_token.3 au_to_attr64.3 && \
+	  $(LN_S) -f au_token.3 au_to_data.3 && \
+	  $(LN_S) -f au_token.3 au_to_exit.3 && \
+	  $(LN_S) -f au_token.3 au_to_groups.3 && \
+	  $(LN_S) -f au_token.3 au_to_newgroups.3 && \
+	  $(LN_S) -f au_token.3 au_to_in_addr.3 && \
+	  $(LN_S) -f au_token.3 au_to_in_addr_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_ip.3 && \
+	  $(LN_S) -f au_token.3 au_to_ipc.3 && \
+	  $(LN_S) -f au_token.3 au_to_ipc_perm.3 && \
+	  $(LN_S) -f au_token.3 au_to_iport.3 && \
+	  $(LN_S) -f au_token.3 au_to_opaque.3 && \
+	  $(LN_S) -f au_token.3 au_to_file.3 && \
+	  $(LN_S) -f au_token.3 au_to_text.3 && \
+	  $(LN_S) -f au_token.3 au_to_path.3 && \
+	  $(LN_S) -f au_token.3 au_to_process32.3 && \
+	  $(LN_S) -f au_token.3 au_to_process64.3 && \
+	  $(LN_S) -f au_token.3 au_to_process.3 && \
+	  $(LN_S) -f au_token.3 au_to_process32_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_process64_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_process_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_return32.3 && \
+	  $(LN_S) -f au_token.3 au_to_return64.3 && \
+	  $(LN_S) -f au_token.3 au_to_return.3 && \
+	  $(LN_S) -f au_token.3 au_to_seq.3 && \
+	  $(LN_S) -f au_token.3 au_to_sock_inet32.3 && \
+	  $(LN_S) -f au_token.3 au_to_sock_inet128.3 && \
+	  $(LN_S) -f au_token.3 au_to_sock_inet.3 && \
+	  $(LN_S) -f au_token.3 au_to_socket_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject32.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject64.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject32_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject64_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_me.3 && \
+	  $(LN_S) -f au_token.3 au_to_exec_args.3 && \
+	  $(LN_S) -f au_token.3 au_to_exec_env.3 && \
+	  $(LN_S) -f au_token.3 au_to_header.3 && \
+	  $(LN_S) -f au_token.3 au_to_header32.3 && \
+	  $(LN_S) -f au_token.3 au_to_header64.3 && \
+	  $(LN_S) -f au_token.3 au_to_header_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_header32_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_trailer.3 && \
+	  $(LN_S) -f au_token.3 au_to_zonename.3 && \
+	  $(LN_S) -f au_user.3 setauuser.3 && \
+	  $(LN_S) -f au_user.3 endauuser.3 && \
+	  $(LN_S) -f au_user.3 getauuserent.3 && \
+	  $(LN_S) -f au_user.3 getauuserent_r.3 && \
+	  $(LN_S) -f au_user.3 getauusernam.3 && \
+	  $(LN_S) -f au_user.3 getauusernam_r.3 && \
+	  $(LN_S) -f au_user.3 au_user_mask.3 && \
+	  $(LN_S) -f au_user.3 getfauditflags.3
diff --git a/contrib/openbsm/libbsm/Makefile.in b/contrib/openbsm/libbsm/Makefile.in
index 956d66f7787d6..0549153472a5b 100644
--- a/contrib/openbsm/libbsm/Makefile.in
+++ b/contrib/openbsm/libbsm/Makefile.in
@@ -269,6 +269,7 @@ man3_MANS = \
 	au_free_token.3	\
 	au_io.3		\
 	au_mask.3	\
+	au_notify.3	\
 	au_open.3	\
 	au_socket_type.3	\
 	au_token.3	\
@@ -612,7 +613,8 @@ install-dvi: install-dvi-am
 install-dvi-am:
 
 install-exec-am: install-libLTLIBRARIES
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -655,15 +657,15 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-man
 
 uninstall-man: uninstall-man3
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-exec-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool cscopelist ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-man install-man3 install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
@@ -673,6 +675,118 @@ uninstall-man: uninstall-man3
 	uninstall-man uninstall-man3
 
 
+install-exec-hook:
+	cd $(DESTDIR)$(mandir) && \
+	  $(LN_S) -f au_class.3 getauclassent.3 && \
+	  $(LN_S) -f au_class.3 getauclassent_r.3 && \
+	  $(LN_S) -f au_class.3 getauclassnam.3 && \
+	  $(LN_S) -f au_class.3 getauclassnam_r.3 && \
+	  $(LN_S) -f au_class.3 setauclass.3 && \
+	  $(LN_S) -f au_class.3 endauclass.3 && \
+	  $(LN_S) -f au_control.3 setac.3 && \
+	  $(LN_S) -f au_control.3 endac.3 && \
+	  $(LN_S) -f au_control.3 getacdir.3 && \
+	  $(LN_S) -f au_control.3 getacdist.3 && \
+	  $(LN_S) -f au_control.3 getacexpire.3 && \
+	  $(LN_S) -f au_control.3 getacfilesz.3 && \
+	  $(LN_S) -f au_control.3 getacflg.3 && \
+	  $(LN_S) -f au_control.3 getachost.3 && \
+	  $(LN_S) -f au_control.3 getacmin.3 && \
+	  $(LN_S) -f au_control.3 getacna.3 && \
+	  $(LN_S) -f au_control.3 getacpol.3 && \
+	  $(LN_S) -f au_control.3 au_poltostr.3 && \
+	  $(LN_S) -f au_control.3 ac_strtopol.3 && \
+	  $(LN_S) -f au_domain.3 au_bsm_to_domain.3 && \
+	  $(LN_S) -f au_domain.3 au_domain_to_bsm.3 && \
+	  $(LN_S) -f au_errno.3 au_bsm_to_errno.3 && \
+	  $(LN_S) -f au_errno.3 au_errno_to_bsm.3 && \
+	  $(LN_S) -f au_errno.3 au_strerror.3 && \
+	  $(LN_S) -f au_event.3 setauevent.3 && \
+	  $(LN_S) -f au_event.3 endauevent.3 && \
+	  $(LN_S) -f au_event.3 getauevent.3 && \
+	  $(LN_S) -f au_event.3 getauevent_r.3 && \
+	  $(LN_S) -f au_event.3 getauevnam.3 && \
+	  $(LN_S) -f au_event.3 getauevnam_r.3 && \
+	  $(LN_S) -f au_event.3 getauevnum.3 && \
+	  $(LN_S) -f au_event.3 getauevnum_r.3 && \
+	  $(LN_S) -f au_event.3 getauevnonam.3 && \
+	  $(LN_S) -f au_event.3 getauevnonam_r.3 && \
+	  $(LN_S) -f au_fcntl.3 au_bsm_to_fcntl_cmd.3 && \
+	  $(LN_S) -f au_fcntl.3 au_fcntl_cmd_to_bsm.3 && \
+	  $(LN_S) -f au_io.3 au_fetch_tok.3 && \
+	  $(LN_S) -f au_io.3 au_print_tok.3 && \
+	  $(LN_S) -f au_io.3 au_print_flags_tok.3 && \
+	  $(LN_S) -f au_io.3 au_read_rec.3 && \
+	  $(LN_S) -f au_mask.3 au_preselect.3 && \
+	  $(LN_S) -f au_mask.3 getauditflagsbin.3 && \
+	  $(LN_S) -f au_mask.3 getauditflagschar.3 && \
+	  $(LN_S) -f au_notify.3 au_get_state.3 && \
+	  $(LN_S) -f au_notify.3 au_notify_initialize.3 && \
+	  $(LN_S) -f au_notify.3 au_notify_terminate.3 && \
+	  $(LN_S) -f au_open.3 au_open.3 && \
+	  $(LN_S) -f au_open.3 au_write.3 && \
+	  $(LN_S) -f au_open.3 au_close.3 && \
+	  $(LN_S) -f au_open.3 au_close_buffer.3 && \
+	  $(LN_S) -f au_open.3 au_close_token.3 && \
+	  $(LN_S) -f au_socket_type.3 au_bsm_to_socket_type.3 && \
+	  $(LN_S) -f au_socket_type.3 au_socket_type_to_bsm.3 && \
+	  $(LN_S) -f au_token.3 au_to_arg32.3 && \
+	  $(LN_S) -f au_token.3 au_to_arg64.3 && \
+	  $(LN_S) -f au_token.3 au_to_arg.3 && \
+	  $(LN_S) -f au_token.3 au_to_attr64.3 && \
+	  $(LN_S) -f au_token.3 au_to_data.3 && \
+	  $(LN_S) -f au_token.3 au_to_exit.3 && \
+	  $(LN_S) -f au_token.3 au_to_groups.3 && \
+	  $(LN_S) -f au_token.3 au_to_newgroups.3 && \
+	  $(LN_S) -f au_token.3 au_to_in_addr.3 && \
+	  $(LN_S) -f au_token.3 au_to_in_addr_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_ip.3 && \
+	  $(LN_S) -f au_token.3 au_to_ipc.3 && \
+	  $(LN_S) -f au_token.3 au_to_ipc_perm.3 && \
+	  $(LN_S) -f au_token.3 au_to_iport.3 && \
+	  $(LN_S) -f au_token.3 au_to_opaque.3 && \
+	  $(LN_S) -f au_token.3 au_to_file.3 && \
+	  $(LN_S) -f au_token.3 au_to_text.3 && \
+	  $(LN_S) -f au_token.3 au_to_path.3 && \
+	  $(LN_S) -f au_token.3 au_to_process32.3 && \
+	  $(LN_S) -f au_token.3 au_to_process64.3 && \
+	  $(LN_S) -f au_token.3 au_to_process.3 && \
+	  $(LN_S) -f au_token.3 au_to_process32_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_process64_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_process_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_return32.3 && \
+	  $(LN_S) -f au_token.3 au_to_return64.3 && \
+	  $(LN_S) -f au_token.3 au_to_return.3 && \
+	  $(LN_S) -f au_token.3 au_to_seq.3 && \
+	  $(LN_S) -f au_token.3 au_to_sock_inet32.3 && \
+	  $(LN_S) -f au_token.3 au_to_sock_inet128.3 && \
+	  $(LN_S) -f au_token.3 au_to_sock_inet.3 && \
+	  $(LN_S) -f au_token.3 au_to_socket_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject32.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject64.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject32_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject64_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_subject_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_me.3 && \
+	  $(LN_S) -f au_token.3 au_to_exec_args.3 && \
+	  $(LN_S) -f au_token.3 au_to_exec_env.3 && \
+	  $(LN_S) -f au_token.3 au_to_header.3 && \
+	  $(LN_S) -f au_token.3 au_to_header32.3 && \
+	  $(LN_S) -f au_token.3 au_to_header64.3 && \
+	  $(LN_S) -f au_token.3 au_to_header_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_header32_ex.3 && \
+	  $(LN_S) -f au_token.3 au_to_trailer.3 && \
+	  $(LN_S) -f au_token.3 au_to_zonename.3 && \
+	  $(LN_S) -f au_user.3 setauuser.3 && \
+	  $(LN_S) -f au_user.3 endauuser.3 && \
+	  $(LN_S) -f au_user.3 getauuserent.3 && \
+	  $(LN_S) -f au_user.3 getauuserent_r.3 && \
+	  $(LN_S) -f au_user.3 getauusernam.3 && \
+	  $(LN_S) -f au_user.3 getauusernam_r.3 && \
+	  $(LN_S) -f au_user.3 au_user_mask.3 && \
+	  $(LN_S) -f au_user.3 getfauditflags.3
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/openbsm/libbsm/au_class.3 b/contrib/openbsm/libbsm/au_class.3
index a3f200f92c67c..acdac62dc5aa6 100644
--- a/contrib/openbsm/libbsm/au_class.3
+++ b/contrib/openbsm/libbsm/au_class.3
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#7 $
-.\"
 .Dd April 19, 2005
 .Dt AU_CLASS 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_control.3 b/contrib/openbsm/libbsm/au_control.3
index 622fae21df3f6..d4d4450264710 100644
--- a/contrib/openbsm/libbsm/au_control.3
+++ b/contrib/openbsm/libbsm/au_control.3
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#17 $
-.\"
 .Dd April 19, 2005
 .Dt AU_CONTROL 3
 .Os
@@ -56,7 +54,7 @@
 .Ft int
 .Fn getacdist "void"
 .Ft int
-.Fn getacexpire "int *andflg, time_t *age, size_t *size"
+.Fn getacexpire "int *andflg" "time_t *age" "size_t *size"
 .Ft int
 .Fn getacfilesz "size_t *size_val"
 .Ft int
diff --git a/contrib/openbsm/libbsm/au_domain.3 b/contrib/openbsm/libbsm/au_domain.3
index 6d57d2b530426..2f16b38481510 100644
--- a/contrib/openbsm/libbsm/au_domain.3
+++ b/contrib/openbsm/libbsm/au_domain.3
@@ -26,8 +26,6 @@
 .\" 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/au_domain.3#2 $
-.\"
 .Dd December 28, 2008
 .Dt AU_BSM_TO_DOMAIN 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_errno.3 b/contrib/openbsm/libbsm/au_errno.3
index 3680a4ee3e0db..93873cec7323e 100644
--- a/contrib/openbsm/libbsm/au_errno.3
+++ b/contrib/openbsm/libbsm/au_errno.3
@@ -26,8 +26,6 @@
 .\" 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/au_errno.3#4 $
-.\"
 .Dd December 8, 2008
 .Dt AU_BSM_TO_ERRNO 3
 .Os
@@ -54,7 +52,7 @@ and BSM error number spaces found in BSM return tokens.
 The
 .Fn au_bsm_to_errno
 function accepts a BSM error value,
-.Fa bsm_error,
+.Fa bsm_error ,
 and converts it to an
 .Xr errno 2
 that will be stored in the integer pointed to by
diff --git a/contrib/openbsm/libbsm/au_event.3 b/contrib/openbsm/libbsm/au_event.3
index 8fe25b45e9566..781ba1b822b4e 100644
--- a/contrib/openbsm/libbsm/au_event.3
+++ b/contrib/openbsm/libbsm/au_event.3
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#8 $
-.\"
 .Dd April 19, 2005
 .Dt AU_EVENT 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_fcntl_cmd.3 b/contrib/openbsm/libbsm/au_fcntl_cmd.3
index 7843c94efb90b..a87c3ec39ebd1 100644
--- a/contrib/openbsm/libbsm/au_fcntl_cmd.3
+++ b/contrib/openbsm/libbsm/au_fcntl_cmd.3
@@ -26,8 +26,6 @@
 .\" 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/au_fcntl_cmd.3#2 $
-.\"
 .Dd March 5, 2009
 .Dt AU_BSM_TO_FCNTL_CMD 3
 .Os
@@ -79,8 +77,8 @@ not set
 .Sh SEE ALSO
 .Xr fcntl 2 ,
 .Xr au_bsm_to_domain 3 ,
-.Xr au_domain_to_bsm 3 ,
 .Xr au_bsm_to_socket_type 3 ,
+.Xr au_domain_to_bsm 3 ,
 .Xr au_socket_type_to_bsm 3 ,
 .Xr libbsm 3
 .Sh HISTORY
diff --git a/contrib/openbsm/libbsm/au_free_token.3 b/contrib/openbsm/libbsm/au_free_token.3
index 223d50a1a5517..882064579479b 100644
--- a/contrib/openbsm/libbsm/au_free_token.3
+++ b/contrib/openbsm/libbsm/au_free_token.3
@@ -27,8 +27,6 @@
 .\" 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/au_free_token.3#7 $
-.\"
 .Dd April 19, 2005
 .Dt AU_FREE_TOKEN 3
 .Os
@@ -75,8 +73,8 @@ This is, in fact, what
 .Xr audit_write 3
 does, in keeping with the existing memory management model of the BSM API.
 .Sh SEE ALSO
-.Xr audit_write 3 ,
 .Xr au_write 3 ,
+.Xr audit_write 3 ,
 .Xr libbsm 3
 .Sh HISTORY
 The OpenBSM implementation was created by McAfee Research, the security
diff --git a/contrib/openbsm/libbsm/au_io.3 b/contrib/openbsm/libbsm/au_io.3
index bd8e5a12066a4..bfea1a86639f2 100644
--- a/contrib/openbsm/libbsm/au_io.3
+++ b/contrib/openbsm/libbsm/au_io.3
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#9 $
-.\"
 .Dd August 4, 2009
 .Dt AU_IO 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_mask.3 b/contrib/openbsm/libbsm/au_mask.3
index 28452796cb1a9..c2099ea139945 100644
--- a/contrib/openbsm/libbsm/au_mask.3
+++ b/contrib/openbsm/libbsm/au_mask.3
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#6 $
-.\"
 .Dd April 19, 2005
 .Dt AU_MASK 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_notify.3 b/contrib/openbsm/libbsm/au_notify.3
new file mode 100644
index 0000000000000..06e63bfa755f4
--- /dev/null
+++ b/contrib/openbsm/libbsm/au_notify.3
@@ -0,0 +1,118 @@
+.\"-
+.\" Copyright (c) 2004-2009 Apple Inc.
+.\" Copyright (c) 2015 Christian Brueffer
+.\" All rights reserved.
+.\"
+.\" 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.
+.\" 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 the author 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 THE AUTHOR AND 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 DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND 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.
+.\"
+.Dd July 29, 2015
+.Dt AU_NOTIFY 3
+.Os
+.Sh NAME
+.Nm au_get_state ,
+.Nm au_notify_initialize ,
+.Nm au_notify_terminate
+.Nd "audit event notification"
+.Sh LIBRARY
+.Lb libbsm
+.Sh SYNOPSIS
+.In bsm/libbsm.h
+.Ft int
+.Fn au_get_state "void"
+.Ft uint32_t
+.Fn au_notify_initialize "void"
+.Ft int
+.Fn au_notify_terminate "void"
+.Sh DESCRIPTION
+The
+.Nm au_notify
+audit notification API tracks audit state in a form permitting efficient
+update, avoiding frequent system calls to check the kernel audit state.
+It is implemented only for Darwin/Mac OS X.
+.Pp
+The
+.Fn au_get_state
+function provides a lightweight way to check whether or not auditing is
+enabled.
+If a client wants to use this function to determine whether an entire
+series of audit calls should be made -- as in the common case of a caller
+building a set of tokens, then writing them -- it should cache the audit
+status in a local variable.
+This function always returns the current state of auditing.
+If audit notification has not already been initialized by calling
+.Fn au_notify_initialize
+it will be automatically initialized on the first call of
+this function.
+.Pp
+The
+.Fn au_notify_initialize
+function initializes audit notification.
+.Pp
+The
+.Fn au_notify_terminate
+function cancels audit notification and frees the resources associated with it.
+Responsible code that no longer needs to use
+.Fn au_get_state
+should call this function.
+.Sh RETURN VALUES
+If no error occurred the
+.Fn au_get_state
+function returns
+.Dv AUC_NOAUDIT
+if auditing is disabled or suspended, and
+.Dv AUC_AUDITING
+if auditing is enabled and active.
+Otherwise, the function can return any of the errno values defined for
+.Xr setaudit 2 ,
+or
+.Dv AU_UNIMPL
+if audit does not appear to be supported by the system.
+.Pp
+The
+.Fn au_notify_initialize
+function returns 0 on success,
+.Dv AU_UNIMPL
+if audit does not appear to be supported by the system,
+or one of the status codes defined in
+.In notify.h
+on Mac OS X to indicate the error.
+.Pp
+The
+.Fn au_notify_terminate
+function returns 0 on success, or \-1 on failure.
+.Sh SEE ALSO
+.Xr libbsm 3 ,
+.Xr notify 3 (Mac OS X)
+.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.
+.Sh AUTHORS
+This software was created by
+.An Apple Computer, Inc .
+.Pp
+The Basic Security Module (BSM) interface to audit records and audit event
+stream format were defined by Sun Microsystems.
diff --git a/contrib/openbsm/libbsm/au_open.3 b/contrib/openbsm/libbsm/au_open.3
index bbb0eca8dda90..522354f320630 100644
--- a/contrib/openbsm/libbsm/au_open.3
+++ b/contrib/openbsm/libbsm/au_open.3
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#8 $
-.\"
 .Dd March 4, 2006
 .Dt AU_OPEN 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_socket_type.3 b/contrib/openbsm/libbsm/au_socket_type.3
index 174e5c70dcd85..5668569f7b4d2 100644
--- a/contrib/openbsm/libbsm/au_socket_type.3
+++ b/contrib/openbsm/libbsm/au_socket_type.3
@@ -26,8 +26,6 @@
 .\" 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/au_socket_type.3#1 $
-.\"
 .Dd December 28, 2008
 .Dt AU_BSM_TO_SOCKET_TYPE 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_token.3 b/contrib/openbsm/libbsm/au_token.3
index 2888729e1eea3..045924242e7d7 100644
--- a/contrib/openbsm/libbsm/au_token.3
+++ b/contrib/openbsm/libbsm/au_token.3
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#17 $
-.\"
 .Dd April 19, 2005
 .Dt AU_TOKEN 3
 .Os
diff --git a/contrib/openbsm/libbsm/au_user.3 b/contrib/openbsm/libbsm/au_user.3
index 3016f65b10d90..d2a4fa115e299 100644
--- a/contrib/openbsm/libbsm/au_user.3
+++ b/contrib/openbsm/libbsm/au_user.3
@@ -23,8 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#10 $
-.\"
 .Dd April 19, 2005
 .Dt AU_USER 3
 .Os
diff --git a/contrib/openbsm/libbsm/audit_submit.3 b/contrib/openbsm/libbsm/audit_submit.3
index ab1fc64be429a..c3be666b365d7 100644
--- a/contrib/openbsm/libbsm/audit_submit.3
+++ b/contrib/openbsm/libbsm/audit_submit.3
@@ -24,8 +24,6 @@
 .\" 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#19 $
-.\"
 .Dd January 18, 2008
 .Dt AUDIT_SUBMIT 3
 .Os
diff --git a/contrib/openbsm/libbsm/bsm_audit.c b/contrib/openbsm/libbsm/bsm_audit.c
index 693419f32e8e5..f7a00c6fa651d 100644
--- a/contrib/openbsm/libbsm/bsm_audit.c
+++ b/contrib/openbsm/libbsm/bsm_audit.c
@@ -29,8 +29,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#37 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/libbsm/bsm_class.c b/contrib/openbsm/libbsm/bsm_class.c
index 358afbb85acb6..8ee193fedb544 100644
--- a/contrib/openbsm/libbsm/bsm_class.c
+++ b/contrib/openbsm/libbsm/bsm_class.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#16 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/libbsm/bsm_control.c b/contrib/openbsm/libbsm/bsm_control.c
index baaa0a5f48b25..94d94206b79cf 100644
--- a/contrib/openbsm/libbsm/bsm_control.c
+++ b/contrib/openbsm/libbsm/bsm_control.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#41 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/libbsm/bsm_domain.c b/contrib/openbsm/libbsm/bsm_domain.c
index 2b011f5a2ac35..f6aeef69036f3 100644
--- a/contrib/openbsm/libbsm/bsm_domain.c
+++ b/contrib/openbsm/libbsm/bsm_domain.c
@@ -25,8 +25,6 @@
  * 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. 
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#3 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/libbsm/bsm_errno.c b/contrib/openbsm/libbsm/bsm_errno.c
index 8682fc784e73c..b4b22f3e845e6 100644
--- a/contrib/openbsm/libbsm/bsm_errno.c
+++ b/contrib/openbsm/libbsm/bsm_errno.c
@@ -25,8 +25,6 @@
  * 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. 
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#22 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/libbsm/bsm_event.c b/contrib/openbsm/libbsm/bsm_event.c
index f3c660168bf74..5499083d48190 100644
--- a/contrib/openbsm/libbsm/bsm_event.c
+++ b/contrib/openbsm/libbsm/bsm_event.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#17 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/libbsm/bsm_fcntl.c b/contrib/openbsm/libbsm/bsm_fcntl.c
index 41b6d0d600c40..45ae5da19df1f 100644
--- a/contrib/openbsm/libbsm/bsm_fcntl.c
+++ b/contrib/openbsm/libbsm/bsm_fcntl.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 $
  */
 
 #include <sys/param.h>
diff --git a/contrib/openbsm/libbsm/bsm_flags.c b/contrib/openbsm/libbsm/bsm_flags.c
index c87ae842a587f..46b8a1fc53fe5 100644
--- a/contrib/openbsm/libbsm/bsm_flags.c
+++ b/contrib/openbsm/libbsm/bsm_flags.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#16 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/libbsm/bsm_io.c b/contrib/openbsm/libbsm/bsm_io.c
index 44c3b351eb1e8..43cf7e9990c1e 100644
--- a/contrib/openbsm/libbsm/bsm_io.c
+++ b/contrib/openbsm/libbsm/bsm_io.c
@@ -31,8 +31,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#75 $
  */
 
 #include <sys/types.h>
@@ -268,7 +266,7 @@ print_xml_string(FILE *fp, const char *str, size_t len)
 }
 
 /*
- * Prints the beggining of attribute.
+ * Prints the beginning of an attribute.
  */
 static void
 open_attr(FILE *fp, const char *str)
@@ -278,7 +276,7 @@ open_attr(FILE *fp, const char *str)
 }
 
 /*
- * Prints the end of attribute.
+ * Prints the end of an attribute.
  */
 static void
 close_attr(FILE *fp)
@@ -288,7 +286,7 @@ close_attr(FILE *fp)
 }
 
 /*
- * Prints the end of tag.
+ * Prints the end of a tag.
  */
 static void
 close_tag(FILE *fp, u_char type)
@@ -596,6 +594,7 @@ print_tok_type(FILE *fp, u_char type, const char *tokname, int oflags)
 
 		case AUT_SOCKINET128:
 			fprintf(fp, "<socket-inet6 ");
+			break;
 
 		case AUT_SUBJECT32:
 			fprintf(fp, "<subject ");
diff --git a/contrib/openbsm/libbsm/bsm_mask.c b/contrib/openbsm/libbsm/bsm_mask.c
index afbed5e3f7b24..42e4e71c09c83 100644
--- a/contrib/openbsm/libbsm/bsm_mask.c
+++ b/contrib/openbsm/libbsm/bsm_mask.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#15 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/libbsm/bsm_notify.c b/contrib/openbsm/libbsm/bsm_notify.c
index df972aaf04304..a2dda74ab628b 100644
--- a/contrib/openbsm/libbsm/bsm_notify.c
+++ b/contrib/openbsm/libbsm/bsm_notify.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#17 $
  */
 
 /*
diff --git a/contrib/openbsm/libbsm/bsm_socket_type.c b/contrib/openbsm/libbsm/bsm_socket_type.c
index a10b60905491b..ffbe39e3b4088 100644
--- a/contrib/openbsm/libbsm/bsm_socket_type.c
+++ b/contrib/openbsm/libbsm/bsm_socket_type.c
@@ -25,8 +25,6 @@
  * 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. 
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_socket_type.c#1 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/libbsm/bsm_token.c b/contrib/openbsm/libbsm/bsm_token.c
index a6b975d04d1ba..682836f438709 100644
--- a/contrib/openbsm/libbsm/bsm_token.c
+++ b/contrib/openbsm/libbsm/bsm_token.c
@@ -29,8 +29,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#99 $
  */
 
 #include <sys/types.h>
diff --git a/contrib/openbsm/libbsm/bsm_user.c b/contrib/openbsm/libbsm/bsm_user.c
index c7464f04b7bd1..5b4807004ecfa 100644
--- a/contrib/openbsm/libbsm/bsm_user.c
+++ b/contrib/openbsm/libbsm/bsm_user.c
@@ -26,8 +26,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#20 $
  */
 
 #include <config/config.h>
diff --git a/contrib/openbsm/libbsm/bsm_wrappers.c b/contrib/openbsm/libbsm/bsm_wrappers.c
index 2d24a0ce0f69f..01daaf1421e88 100644
--- a/contrib/openbsm/libbsm/bsm_wrappers.c
+++ b/contrib/openbsm/libbsm/bsm_wrappers.c
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#32 $
  */
 
 #ifdef __APPLE__
diff --git a/contrib/openbsm/libbsm/libbsm.3 b/contrib/openbsm/libbsm/libbsm.3
index 151e0488d5a16..d84e77461bb2f 100644
--- a/contrib/openbsm/libbsm/libbsm.3
+++ b/contrib/openbsm/libbsm/libbsm.3
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#17 $
-.\"
 .Dd March 5, 2009
 .Dt LIBBSM 3
 .Os
diff --git a/contrib/openbsm/man/Makefile.am b/contrib/openbsm/man/Makefile.am
index ad1802e0f605b..26e89f672b5bb 100644
--- a/contrib/openbsm/man/Makefile.am
+++ b/contrib/openbsm/man/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.am#2 $
-##
-
 man2_MANS =			\
 	audit.2			\
 	auditctl.2		\
@@ -19,6 +15,7 @@ man5_MANS =			\
 	audit_user.5		\
 	audit_warn.5
 
-# How to do MLINKS in automake?
-# MLINKS= getaudit.2 getaudit_addr.2					\
-# 	setaudit.2 setaudit_addr.2
+install-exec-hook:
+	cd $(DESTDIR)$(mandir) && \
+          $(LN_S) -f getaudit.2 getaudit_addr.2 && \
+          $(LN_S) -f setaudit.2 setaudit_addr.2
diff --git a/contrib/openbsm/man/Makefile.in b/contrib/openbsm/man/Makefile.in
index 56772f2ddbaa0..bd416e2b2296a 100644
--- a/contrib/openbsm/man/Makefile.in
+++ b/contrib/openbsm/man/Makefile.in
@@ -473,7 +473,8 @@ install-dvi: install-dvi-am
 install-dvi-am:
 
 install-exec-am:
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -514,25 +515,26 @@ uninstall-am: uninstall-man
 
 uninstall-man: uninstall-man2 uninstall-man5
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-exec-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man2 \
-	install-man5 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-man uninstall-man2 \
-	uninstall-man5
-
-
-# How to do MLINKS in automake?
-# MLINKS= getaudit.2 getaudit_addr.2					\
-# 	setaudit.2 setaudit_addr.2
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man2 install-man5 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-man uninstall-man2 uninstall-man5
+
+
+install-exec-hook:
+	cd $(DESTDIR)$(mandir) && \
+          $(LN_S) -f getaudit.2 getaudit_addr.2 && \
+          $(LN_S) -f setaudit.2 setaudit_addr.2
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/contrib/openbsm/man/audit.2 b/contrib/openbsm/man/audit.2
index 1ee61b9f0def1..d64dfe975176a 100644
--- a/contrib/openbsm/man/audit.2
+++ b/contrib/openbsm/man/audit.2
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#9 $
-.\"
 .Dd April 19, 2005
 .Dt AUDIT 2
 .Os
diff --git a/contrib/openbsm/man/audit.log.5 b/contrib/openbsm/man/audit.log.5
index fd5289620ea98..d85fdccb2bf0f 100644
--- a/contrib/openbsm/man/audit.log.5
+++ b/contrib/openbsm/man/audit.log.5
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#26 $
-.\"
 .Dd November 5, 2006
 .Dt AUDIT.LOG 5
 .Os
diff --git a/contrib/openbsm/man/audit_class.5 b/contrib/openbsm/man/audit_class.5
index c92f57f1a2d58..8ea21d31f50c6 100644
--- a/contrib/openbsm/man/audit_class.5
+++ b/contrib/openbsm/man/audit_class.5
@@ -25,8 +25,6 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#11 $
-.\"
 .Dd January 24, 2004
 .Dt AUDIT_CLASS 5
 .Os
diff --git a/contrib/openbsm/man/audit_control.5 b/contrib/openbsm/man/audit_control.5
index 69ff80c54a7c1..30777858028d6 100644
--- a/contrib/openbsm/man/audit_control.5
+++ b/contrib/openbsm/man/audit_control.5
@@ -26,8 +26,6 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#26 $
-.\"
 .Dd May 14, 2009
 .Dt AUDIT_CONTROL 5
 .Os
diff --git a/contrib/openbsm/man/audit_event.5 b/contrib/openbsm/man/audit_event.5
index 184a82d50fcf8..1305ef51291c4 100644
--- a/contrib/openbsm/man/audit_event.5
+++ b/contrib/openbsm/man/audit_event.5
@@ -25,8 +25,6 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#12 $
-.\"
 .Dd January 24, 2004
 .Dt AUDIT_EVENT 5
 .Os
diff --git a/contrib/openbsm/man/audit_user.5 b/contrib/openbsm/man/audit_user.5
index 5075f4a26b578..cac47a3d12227 100644
--- a/contrib/openbsm/man/audit_user.5
+++ b/contrib/openbsm/man/audit_user.5
@@ -25,8 +25,6 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#14 $
-.\"
 .Dd January 4, 2008
 .Dt AUDIT_USER 5
 .Os
diff --git a/contrib/openbsm/man/audit_warn.5 b/contrib/openbsm/man/audit_warn.5
index c53f163195ad9..8734b37b25605 100644
--- a/contrib/openbsm/man/audit_warn.5
+++ b/contrib/openbsm/man/audit_warn.5
@@ -25,8 +25,6 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#10 $
-.\"
 .Dd March 17, 2004
 .Dt AUDIT_WARN 5
 .Os
diff --git a/contrib/openbsm/man/auditctl.2 b/contrib/openbsm/man/auditctl.2
index a5346fb853e14..f4b262939bc14 100644
--- a/contrib/openbsm/man/auditctl.2
+++ b/contrib/openbsm/man/auditctl.2
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#9 $
-.\"
 .Dd April 19, 2005
 .Dt AUDITCTL 2
 .Os
diff --git a/contrib/openbsm/man/auditon.2 b/contrib/openbsm/man/auditon.2
index 8b880b7f9125c..aa5c760f3fc6c 100644
--- a/contrib/openbsm/man/auditon.2
+++ b/contrib/openbsm/man/auditon.2
@@ -26,8 +26,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#18 $
-.\"
 .Dd January 29, 2009
 .Dt AUDITON 2
 .Os
diff --git a/contrib/openbsm/man/getaudit.2 b/contrib/openbsm/man/getaudit.2
index 5935273ba45e1..ae5843d45a254 100644
--- a/contrib/openbsm/man/getaudit.2
+++ b/contrib/openbsm/man/getaudit.2
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#11 $
-.\"
 .Dd October 19, 2008
 .Dt GETAUDIT 2
 .Os
diff --git a/contrib/openbsm/man/getauid.2 b/contrib/openbsm/man/getauid.2
index dc6ae0afa77a5..3d28d0f10499d 100644
--- a/contrib/openbsm/man/getauid.2
+++ b/contrib/openbsm/man/getauid.2
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#9 $
-.\"
 .Dd April 19, 2005
 .Dt GETAUID 2
 .Os
diff --git a/contrib/openbsm/man/setaudit.2 b/contrib/openbsm/man/setaudit.2
index 41448d64699f5..8565b718265d2 100644
--- a/contrib/openbsm/man/setaudit.2
+++ b/contrib/openbsm/man/setaudit.2
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#12 $
-.\"
 .Dd April 19, 2005
 .Dt SETAUDIT 2
 .Os
diff --git a/contrib/openbsm/man/setauid.2 b/contrib/openbsm/man/setauid.2
index 770c32b4f91b7..11b5dae0e7a9f 100644
--- a/contrib/openbsm/man/setauid.2
+++ b/contrib/openbsm/man/setauid.2
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#9 $
-.\"
 .Dd April 19, 2005
 .Dt SETAUID 2
 .Os
diff --git a/contrib/openbsm/modules/Makefile.am b/contrib/openbsm/modules/Makefile.am
index 7d59ec2ea0463..c4a3c203b4164 100644
--- a/contrib/openbsm/modules/Makefile.am
+++ b/contrib/openbsm/modules/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.am#2 $
-##
-
 SUBDIRS =		\
 	auditfilter_noop
 
diff --git a/contrib/openbsm/modules/auditfilter_noop/Makefile.am b/contrib/openbsm/modules/auditfilter_noop/Makefile.am
index 5b432069fa3ac..3500fd04413ec 100644
--- a/contrib/openbsm/modules/auditfilter_noop/Makefile.am
+++ b/contrib/openbsm/modules/auditfilter_noop/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#4 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c b/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
index 79834d4644290..7e2e973be0456 100644
--- a/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
+++ b/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
@@ -24,8 +24,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#6 $
  */
 
 /*
diff --git a/contrib/openbsm/sys/Makefile.am b/contrib/openbsm/sys/Makefile.am
index 17b3afb964bfa..0b0261c416874 100644
--- a/contrib/openbsm/sys/Makefile.am
+++ b/contrib/openbsm/sys/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/sys/Makefile.am#2 $
-##
-
 SUBDIRS =		\
 	bsm
 
diff --git a/contrib/openbsm/sys/bsm/Makefile.am b/contrib/openbsm/sys/bsm/Makefile.am
index 66e79b17abfb6..266243d91d464 100644
--- a/contrib/openbsm/sys/bsm/Makefile.am
+++ b/contrib/openbsm/sys/bsm/Makefile.am
@@ -1,8 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.am#5 $
-##
-
-
 if ! USE_NATIVE_INCLUDES 
 openbsmdir = $(includedir)/bsm
 
diff --git a/contrib/openbsm/sys/bsm/audit.h b/contrib/openbsm/sys/bsm/audit.h
index bb4a9497b64ed..215981301a754 100644
--- a/contrib/openbsm/sys/bsm/audit.h
+++ b/contrib/openbsm/sys/bsm/audit.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#10 $
  */
 
 #ifndef	_BSM_AUDIT_H
diff --git a/contrib/openbsm/sys/bsm/audit_domain.h b/contrib/openbsm/sys/bsm/audit_domain.h
index 3969183292cb0..373afa7b4bbcb 100644
--- a/contrib/openbsm/sys/bsm/audit_domain.h
+++ b/contrib/openbsm/sys/bsm/audit_domain.h
@@ -25,8 +25,6 @@
  * 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. 
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_domain.h#2 $
  */
 
 #ifndef _BSM_AUDIT_DOMAIN_H_
diff --git a/contrib/openbsm/sys/bsm/audit_errno.h b/contrib/openbsm/sys/bsm/audit_errno.h
index abdaff8bf4c2b..1c467eedc58ce 100644
--- a/contrib/openbsm/sys/bsm/audit_errno.h
+++ b/contrib/openbsm/sys/bsm/audit_errno.h
@@ -25,8 +25,6 @@
  * 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. 
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#7 $
  */
 
 #ifndef _BSM_AUDIT_ERRNO_H_
diff --git a/contrib/openbsm/sys/bsm/audit_fcntl.h b/contrib/openbsm/sys/bsm/audit_fcntl.h
index 1398b2f0ddde1..708991ebd89f3 100644
--- a/contrib/openbsm/sys/bsm/audit_fcntl.h
+++ b/contrib/openbsm/sys/bsm/audit_fcntl.h
@@ -25,8 +25,6 @@
  * 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. 
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 $
  */
 
 #ifndef	_BSM_AUDIT_FCNTL_H_
diff --git a/contrib/openbsm/sys/bsm/audit_internal.h b/contrib/openbsm/sys/bsm/audit_internal.h
index 21176c8cf26c8..77d3dbe07cd1c 100644
--- a/contrib/openbsm/sys/bsm/audit_internal.h
+++ b/contrib/openbsm/sys/bsm/audit_internal.h
@@ -29,8 +29,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#6 $
  */
 
 #ifndef _AUDIT_INTERNAL_H
diff --git a/contrib/openbsm/sys/bsm/audit_kevents.h b/contrib/openbsm/sys/bsm/audit_kevents.h
index 94e42ab2eb837..3f92b71956476 100644
--- a/contrib/openbsm/sys/bsm/audit_kevents.h
+++ b/contrib/openbsm/sys/bsm/audit_kevents.h
@@ -25,18 +25,16 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $
  */
 
 #ifndef _BSM_AUDIT_KEVENTS_H_
 #define	_BSM_AUDIT_KEVENTS_H_
 
 /*
- * The reserved event numbers for kernel events are 1...2047 and 43001..44900.
+ * The reserved event numbers for kernel events are 1...2047 and 43001..44999.
  */
-#define	AUE_IS_A_KEVENT(e)	(((e) > 0 && (e) < 2048) || 	\
-    				 ((e) > 43000 && (e) < 45000))
+#define	AUE_IS_A_KEVENT(e)	(((e) > 0 && (e) < 2048) ||	\
+				 ((e) > 43000 && (e) < 45000))
 
 /*
  * Values marked as AUE_NULL are not required to be audited as per CAPP.
@@ -587,7 +585,8 @@
 #define	AUE_OPENAT		43184	/* FreeBSD. */
 #define	AUE_POSIX_OPENPT	43185	/* FreeBSD. */
 #define	AUE_CAP_NEW		43186	/* TrustedBSD. */
-#define	AUE_CAP_GETRIGHTS	43187	/* TrustedBSD. */
+#define	AUE_CAP_RIGHTS_GET	43187	/* TrustedBSD. */
+#define	AUE_CAP_GETRIGHTS	AUE_CAP_RIGHTS_GET
 #define	AUE_CAP_ENTER		43188	/* TrustedBSD. */
 #define	AUE_CAP_GETMODE		43189	/* TrustedBSD. */
 #define	AUE_POSIX_SPAWN		43190	/* Darwin. */
@@ -602,6 +601,14 @@
 #define	AUE_PDGETPID		43199	/* FreeBSD. */
 #define	AUE_PDWAIT		43200	/* FreeBSD. */
 #define	AUE_WAIT6		43201	/* FreeBSD. */
+#define	AUE_CAP_RIGHTS_LIMIT	43202	/* TrustedBSD. */
+#define	AUE_CAP_IOCTLS_LIMIT	43203	/* TrustedBSD. */
+#define	AUE_CAP_IOCTLS_GET	43204	/* TrustedBSD. */
+#define	AUE_CAP_FCNTLS_LIMIT	43205	/* TrustedBSD. */
+#define	AUE_CAP_FCNTLS_GET	43206	/* TrustedBSD. */
+#define	AUE_BINDAT		43207	/* TrustedBSD. */
+#define	AUE_CONNECTAT		43208	/* TrustedBSD. */
+#define	AUE_CHFLAGSAT		43209	/* FreeBSD-specific. */
 
 /*
  * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
diff --git a/contrib/openbsm/sys/bsm/audit_record.h b/contrib/openbsm/sys/bsm/audit_record.h
index 2a49cdc6ec56d..bd87fe8ab70d2 100644
--- a/contrib/openbsm/sys/bsm/audit_record.h
+++ b/contrib/openbsm/sys/bsm/audit_record.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
diff --git a/contrib/openbsm/sys/bsm/audit_socket_type.h b/contrib/openbsm/sys/bsm/audit_socket_type.h
index 85f6aef7ab1c6..660ef0fe79bfb 100644
--- a/contrib/openbsm/sys/bsm/audit_socket_type.h
+++ b/contrib/openbsm/sys/bsm/audit_socket_type.h
@@ -25,8 +25,6 @@
  * 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. 
- *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_socket_type.h#1 $
  */
 
 #ifndef _BSM_AUDIT_SOCKET_TYPE_H_
diff --git a/contrib/openbsm/test/Makefile.am b/contrib/openbsm/test/Makefile.am
index 7b936edad9a3c..5868349062e05 100644
--- a/contrib/openbsm/test/Makefile.am
+++ b/contrib/openbsm/test/Makefile.am
@@ -1,6 +1,2 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.am#3 $
-##
-
 SUBDIRS =		\
 	bsm
diff --git a/contrib/openbsm/test/bsm/Makefile.am b/contrib/openbsm/test/bsm/Makefile.am
index 577e7cb158679..c787f956f9fba 100644
--- a/contrib/openbsm/test/bsm/Makefile.am
+++ b/contrib/openbsm/test/bsm/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#4 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/test/bsm/generate.c b/contrib/openbsm/test/bsm/generate.c
index bbc81bb8ca63f..3416fa35b4553 100644
--- a/contrib/openbsm/test/bsm/generate.c
+++ b/contrib/openbsm/test/bsm/generate.c
@@ -23,8 +23,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#14 $
  */
 
 /*
diff --git a/contrib/openbsm/tools/Makefile.am b/contrib/openbsm/tools/Makefile.am
index 13aa10df68364..47ef3cb4269c6 100644
--- a/contrib/openbsm/tools/Makefile.am
+++ b/contrib/openbsm/tools/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.am#5 $
-##
-
 if USE_NATIVE_INCLUDES
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 else
diff --git a/contrib/openbsm/tools/audump.c b/contrib/openbsm/tools/audump.c
index 82d17ea21baae..cdb8ed1165a66 100644
--- a/contrib/openbsm/tools/audump.c
+++ b/contrib/openbsm/tools/audump.c
@@ -22,8 +22,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/tools/audump.c#9 $
  */
 
 #include <bsm/libbsm.h>
author	Christian Brueffer <brueffer@FreeBSD.org>	2015-12-18 09:48:01 +0000
committer	Christian Brueffer <brueffer@FreeBSD.org>	2015-12-18 09:48:01 +0000
commit	b6a05070fa77edc7ce6e60b61623fd806e807be6 (patch)
tree	aa8cfe0cdfd8d3707778fac1df526d01b514cb3d /contrib/openbsm
parent	88dd7272909c2ab5b796751d679cd9cb67c32cca (diff)
parent	97aa9e7383bb228ff968ff77101bfa4b68358784 (diff)
download	src-test-b6a05070fa77edc7ce6e60b61623fd806e807be6.tar.gz src-test-b6a05070fa77edc7ce6e60b61623fd806e807be6.zip