Vendor import of OpenBSM 1.2-alpha4.vendor/openbsm/1.2-ALPHA-4

160 files changed, 550 insertions, 467 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000000..5540774c7c13
--- /dev/null
+++ b/.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/INSTALL b/INSTALL
index 9e52b0d435a6..307a3bb65000 100644
--- a/INSTALL
+++ b/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/LICENSE b/LICENSE
index e05358484ee1..58bd5fa07bb0 100644
--- a/LICENSE
+++ b/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/Makefile.am b/Makefile.am
index 50731336e55d..b58c170de2ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $
-##
-
 SUBDIRS =		\
 	bsm
 
diff --git a/Makefile.in b/Makefile.in
index 9f90493d6176..4e0a8a8ee9d9 100644
--- a/Makefile.in
+++ b/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/NEWS b/NEWS
index a55fabb2362d..dc49117f75b3 100644
--- a/NEWS
+++ b/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/README b/README
index 17446afddaa8..e60c502849b6 100644
--- a/README
+++ b/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/TODO b/TODO
index 7b8f403f1336..5928aed42a3e 100644
--- a/TODO
+++ b/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/VERSION b/VERSION
index b3ea4dc9eef9..da1fd6293c60 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-OPENBSM_1_2_alpha3
+OPENBSM_1_2_alpha4
diff --git a/autogen.sh b/autogen.sh
index 41fbc31d7246..afa8a03ab410 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $
-#
 
 libtoolize --copy --force
 aclocal
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 16073e982ff1..15a3dbcee361 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $
-##
-
 SUBDIRS =		\
 	auditdistd	\
 	auditfilterd	\
diff --git a/bin/audit/Makefile.am b/bin/audit/Makefile.am
index e7977831fddb..d0af56c347d9 100644
--- a/bin/audit/Makefile.am
+++ b/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/bin/audit/audit.8 b/bin/audit/audit.8
index d5b296068dc2..b9f98b328200 100644
--- a/bin/audit/audit.8
+++ b/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/bin/audit/audit.c b/bin/audit/audit.c
index 95ac3bc44cdb..dfe956f2e005 100644
--- a/bin/audit/audit.c
+++ b/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/bin/auditd/Makefile.am b/bin/auditd/Makefile.am
index 2a187db63f6f..8a2a9dfb3b74 100644
--- a/bin/auditd/Makefile.am
+++ b/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/bin/auditd/audit_triggers.defs b/bin/auditd/audit_triggers.defs
index f5b394dd422b..9fe2c352f591 100644
--- a/bin/auditd/audit_triggers.defs
+++ b/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/bin/auditd/audit_warn.c b/bin/auditd/audit_warn.c
index 22806e24b41c..6bd2b8477c10 100644
--- a/bin/auditd/audit_warn.c
+++ b/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/bin/auditd/auditd.8 b/bin/auditd/auditd.8
index b4375245a10c..c76dfcae92ff 100644
--- a/bin/auditd/auditd.8
+++ b/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/bin/auditd/auditd.c b/bin/auditd/auditd.c
index 26a0d07c3cd7..a4357bd9c0e1 100644
--- a/bin/auditd/auditd.c
+++ b/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/bin/auditd/auditd.h b/bin/auditd/auditd.h
index f952181b33e6..20afd75172cf 100644
--- a/bin/auditd/auditd.h
+++ b/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/bin/auditd/auditd_control.defs b/bin/auditd/auditd_control.defs
index f06fe017a2ca..84f37df435b9 100644
--- a/bin/auditd/auditd_control.defs
+++ b/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/bin/auditd/auditd_darwin.c b/bin/auditd/auditd_darwin.c
index 8530185e4a90..702eb9476ce5 100644
--- a/bin/auditd/auditd_darwin.c
+++ b/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/bin/auditd/auditd_fbsd.c b/bin/auditd/auditd_fbsd.c
index 2da98755f48e..d8f040f391a9 100644
--- a/bin/auditd/auditd_fbsd.c
+++ b/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/bin/auditdistd/Makefile.am b/bin/auditdistd/Makefile.am
index 88f2584d7b30..263cb2d1fdc4 100644
--- a/bin/auditdistd/Makefile.am
+++ b/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/bin/auditdistd/auditdistd.8 b/bin/auditdistd/auditdistd.8
index 299cde46237f..71a65752ed19 100644
--- a/bin/auditdistd/auditdistd.8
+++ b/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/bin/auditdistd/auditdistd.c b/bin/auditdistd/auditdistd.c
index 436531db14f2..696f0488b27a 100644
--- a/bin/auditdistd/auditdistd.c
+++ b/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/bin/auditdistd/auditdistd.conf.5 b/bin/auditdistd/auditdistd.conf.5
index 13abb5a5c4c1..c6ed2b58906b 100644
--- a/bin/auditdistd/auditdistd.conf.5
+++ b/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/bin/auditdistd/auditdistd.h b/bin/auditdistd/auditdistd.h
index 9ac2850a7f8b..d0594f2ebcd8 100644
--- a/bin/auditdistd/auditdistd.h
+++ b/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/bin/auditdistd/faccessat.h b/bin/auditdistd/faccessat.h
index 37d8b89d87a3..568a6b7f0ab8 100644
--- a/bin/auditdistd/faccessat.h
+++ b/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/bin/auditdistd/fstatat.h b/bin/auditdistd/fstatat.h
index a2716b97629e..5327a7c28ad6 100644
--- a/bin/auditdistd/fstatat.h
+++ b/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/bin/auditdistd/openat.h b/bin/auditdistd/openat.h
index defb94746508..1d9801466cb9 100644
--- a/bin/auditdistd/openat.h
+++ b/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/bin/auditdistd/parse.y b/bin/auditdistd/parse.y
index fbe1000f82b2..1f80d5054fff 100644
--- a/bin/auditdistd/parse.y
+++ b/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/bin/auditdistd/pjdlog.c b/bin/auditdistd/pjdlog.c
index e8d5876dfcd3..16f176ecb523 100644
--- a/bin/auditdistd/pjdlog.c
+++ b/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/bin/auditdistd/pjdlog.h b/bin/auditdistd/pjdlog.h
index 0cb61217069c..d6f217f23c24 100644
--- a/bin/auditdistd/pjdlog.h
+++ b/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/bin/auditdistd/proto.c b/bin/auditdistd/proto.c
index 25daf0ccb0db..4e9bea08354b 100644
--- a/bin/auditdistd/proto.c
+++ b/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/bin/auditdistd/proto.h b/bin/auditdistd/proto.h
index 79047b0bc80f..f26c0ad4699b 100644
--- a/bin/auditdistd/proto.h
+++ b/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/bin/auditdistd/proto_common.c b/bin/auditdistd/proto_common.c
index 0fa4d3c5443b..acd2294e2d93 100644
--- a/bin/auditdistd/proto_common.c
+++ b/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/bin/auditdistd/proto_impl.h b/bin/auditdistd/proto_impl.h
index c2ce2d91e9e2..7915ee91b528 100644
--- a/bin/auditdistd/proto_impl.h
+++ b/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/bin/auditdistd/proto_socketpair.c b/bin/auditdistd/proto_socketpair.c
index 8d04c49217e2..fc65c762b088 100644
--- a/bin/auditdistd/proto_socketpair.c
+++ b/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/bin/auditdistd/proto_tcp.c b/bin/auditdistd/proto_tcp.c
index 74d5cd45c502..465221dfe5cc 100644
--- a/bin/auditdistd/proto_tcp.c
+++ b/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/bin/auditdistd/proto_tls.c b/bin/auditdistd/proto_tls.c
index faeb3d8882de..de89147823cf 100644
--- a/bin/auditdistd/proto_tls.c
+++ b/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/bin/auditdistd/proto_uds.c b/bin/auditdistd/proto_uds.c
index 3b3dfb7bbacb..3168bbf890b6 100644
--- a/bin/auditdistd/proto_uds.c
+++ b/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/bin/auditdistd/receiver.c b/bin/auditdistd/receiver.c
index 698619d47326..9dc3b0184c63 100644
--- a/bin/auditdistd/receiver.c
+++ b/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/bin/auditdistd/renameat.h b/bin/auditdistd/renameat.h
index a6a67f8513db..0becb8a58699 100644
--- a/bin/auditdistd/renameat.h
+++ b/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/bin/auditdistd/sandbox.c b/bin/auditdistd/sandbox.c
index 9e4f13466053..53cd6b372307 100644
--- a/bin/auditdistd/sandbox.c
+++ b/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/bin/auditdistd/sandbox.h b/bin/auditdistd/sandbox.h
index 2dc59e4b0365..7bcde25557d8 100644
--- a/bin/auditdistd/sandbox.h
+++ b/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/bin/auditdistd/sender.c b/bin/auditdistd/sender.c
index 256fbb1f4759..4349b0f54cc9 100644
--- a/bin/auditdistd/sender.c
+++ b/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>
@@ -394,6 +392,7 @@ read_thread_wait(void)
 
 	mtx_lock(&adist_remote_mtx);
 	if (adhost->adh_reset) {
+reset:
 		adhost->adh_reset = false;
 		if (trail_filefd(adist_trail) != -1)
 			trail_close(adist_trail);
@@ -408,6 +407,14 @@ read_thread_wait(void)
 	while (trail_filefd(adist_trail) == -1) {
 		newfile = true;
 		wait_for_dir();
+		/*
+		 * We may have been disconnected and reconnected in the
+		 * meantime, check if reset is set.
+		 */
+		mtx_lock(&adist_remote_mtx);
+		if (adhost->adh_reset)
+			goto reset;
+		mtx_unlock(&adist_remote_mtx);
 		if (trail_filefd(adist_trail) == -1)
 			trail_next(adist_trail);
 	}
@@ -634,7 +641,7 @@ recv_thread(void *arg __unused)
 			 * we can use that.
 			 */
 			if (TAILQ_EMPTY(&adist_recv_list)) {
-				rw_unlock(&adist_remote_lock);
+				mtx_unlock(&adist_recv_list_lock);
 				continue;
 			}
 			mtx_unlock(&adist_recv_list_lock);
diff --git a/bin/auditdistd/sigtimedwait.h b/bin/auditdistd/sigtimedwait.h
index 187c6d6dec1b..06a4d130e8b1 100644
--- a/bin/auditdistd/sigtimedwait.h
+++ b/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/bin/auditdistd/strndup.h b/bin/auditdistd/strndup.h
index 6cf3c95258d2..c36a950e21e8 100644
--- a/bin/auditdistd/strndup.h
+++ b/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/bin/auditdistd/subr.c b/bin/auditdistd/subr.c
index e98ed1e74480..ecc626cc9734 100644
--- a/bin/auditdistd/subr.c
+++ b/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>
@@ -228,6 +226,11 @@ wait_for_file_init(int fd)
 	PJDLOG_ASSERT(fd != -1);
 
 #ifdef HAVE_KQUEUE
+	if (wait_for_file_kq != -1) {
+		close(wait_for_file_kq);
+		wait_for_file_kq = -1;
+	}
+
 	kq = kqueue();
 	if (kq == -1) {
 		pjdlog_errno(LOG_WARNING, "kqueue() failed");
diff --git a/bin/auditdistd/subr.h b/bin/auditdistd/subr.h
index 2f11b65004c8..7e2ddeb2a7f9 100644
--- a/bin/auditdistd/subr.h
+++ b/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/bin/auditdistd/synch.h b/bin/auditdistd/synch.h
index e6fe19d1c624..6d83a9bbd7bd 100644
--- a/bin/auditdistd/synch.h
+++ b/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/bin/auditdistd/token.l b/bin/auditdistd/token.l
index 9cebac1e22d9..2dd941a19af1 100644
--- a/bin/auditdistd/token.l
+++ b/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>
@@ -74,7 +72,7 @@ sender			{ DP; return SENDER; }
 source			{ DP; return SOURCE; }
 timeout			{ DP; return TIMEOUT; }
 [0-9]+			{ DP; yylval.num = atoi(yytext); return NUM; }
-\"[a-zA-Z0-9_/ !@#\$%\^\&\*\(\)\+\=\|\;\?\,\.\-\:]*\" { DP; yylval.str = strndup(yytext + 1, strlen(yytext) - 2); return STR; }
+\"[a-zA-Z0-9_/ !@#\$%\^\&\*\(\)\+\=\|\;\?\,\.\[\]\-\:]*\" { DP; yylval.str = strndup(yytext + 1, strlen(yytext) - 2); return STR; }
 \{			{ DP; depth++; return OB; }
 \}			{ DP; depth--; return CB; }
 #.*$			/* ignore comments */;
diff --git a/bin/auditdistd/trail.c b/bin/auditdistd/trail.c
index d4be51eeed36..b8a9881c1ba5 100644
--- a/bin/auditdistd/trail.c
+++ b/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/bin/auditdistd/trail.h b/bin/auditdistd/trail.h
index 33c88b28d665..204ea2b317a3 100644
--- a/bin/auditdistd/trail.h
+++ b/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/bin/auditdistd/unlinkat.h b/bin/auditdistd/unlinkat.h
index ee9c023ba464..6364208fcb9e 100644
--- a/bin/auditdistd/unlinkat.h
+++ b/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/bin/auditfilterd/Makefile.am b/bin/auditfilterd/Makefile.am
index 81d4fb5cc521..400a1d9c2a1e 100644
--- a/bin/auditfilterd/Makefile.am
+++ b/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/bin/auditfilterd/auditfilterd.8 b/bin/auditfilterd/auditfilterd.8
index 034c81bb317a..f78c6640accf 100644
--- a/bin/auditfilterd/auditfilterd.8
+++ b/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/bin/auditfilterd/auditfilterd.c b/bin/auditfilterd/auditfilterd.c
index ba42834b341e..46c86b2eba96 100644
--- a/bin/auditfilterd/auditfilterd.c
+++ b/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/bin/auditfilterd/auditfilterd.h b/bin/auditfilterd/auditfilterd.h
index d55aeee9f580..c178b82b96c9 100644
--- a/bin/auditfilterd/auditfilterd.h
+++ b/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/bin/auditfilterd/auditfilterd_conf.c b/bin/auditfilterd/auditfilterd_conf.c
index b0642fa4d761..bf3b3bb5550d 100644
--- a/bin/auditfilterd/auditfilterd_conf.c
+++ b/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/bin/auditreduce/Makefile.am b/bin/auditreduce/Makefile.am
index a02178b2766b..b5e24338eb46 100644
--- a/bin/auditreduce/Makefile.am
+++ b/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/bin/auditreduce/auditreduce.1 b/bin/auditreduce/auditreduce.1
index 157f31d12aa7..3266ad9bc160 100644
--- a/bin/auditreduce/auditreduce.1
+++ b/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/bin/auditreduce/auditreduce.c b/bin/auditreduce/auditreduce.c
index 0faadda23f9e..f73d341c0110 100644
--- a/bin/auditreduce/auditreduce.c
+++ b/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/bin/auditreduce/auditreduce.h b/bin/auditreduce/auditreduce.h
index 5f548935453a..655b45d21779 100644
--- a/bin/auditreduce/auditreduce.h
+++ b/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/bin/praudit/Makefile.am b/bin/praudit/Makefile.am
index c28afd4758a2..4643b7c77a71 100644
--- a/bin/praudit/Makefile.am
+++ b/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/bin/praudit/praudit.1 b/bin/praudit/praudit.1
index 99ea7c81774f..2954ba3da029 100644
--- a/bin/praudit/praudit.1
+++ b/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/bin/praudit/praudit.c b/bin/praudit/praudit.c
index f20f245ec02e..f7954344b15a 100644
--- a/bin/praudit/praudit.c
+++ b/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/bsm/Makefile.am b/bsm/Makefile.am
index c36d576f9faa..c3df79ebe975 100644
--- a/bsm/Makefile.am
+++ b/bsm/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#5 $
-##
-
 openbsmdir = $(includedir)/bsm
 
 openbsm_HEADERS =		\
diff --git a/bsm/audit_filter.h b/bsm/audit_filter.h
index 8a548f797fa7..b751ba8080de 100644
--- a/bsm/audit_filter.h
+++ b/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/bsm/audit_uevents.h b/bsm/audit_uevents.h
index f71797b5b318..d9dacde18e47 100644
--- a/bsm/audit_uevents.h
+++ b/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/bsm/auditd_lib.h b/bsm/auditd_lib.h
index fb3ca36216e6..926ca037ec63 100644
--- a/bsm/auditd_lib.h
+++ b/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/bsm/libbsm.h b/bsm/libbsm.h
index 5e9258351839..efaf8505708f 100644
--- a/bsm/libbsm.h
+++ b/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/compat/clock_gettime.h b/compat/clock_gettime.h
index ad9315fd3236..7492b16c331c 100644
--- a/compat/clock_gettime.h
+++ b/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/compat/closefrom.h b/compat/closefrom.h
index b0545f352a8c..fdfcfcf19743 100644
--- a/compat/closefrom.h
+++ b/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/compat/compat.h b/compat/compat.h
index 5cd7446e0a6c..e3c4d355a183 100644
--- a/compat/compat.h
+++ b/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/compat/endian.h b/compat/endian.h
index d01c7d4b2340..b4961d5a24ca 100644
--- a/compat/endian.h
+++ b/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/compat/endian_enc.h b/compat/endian_enc.h
index 9e671b766607..c131e43ea83d 100644
--- a/compat/endian_enc.h
+++ b/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/compat/flopen.h b/compat/flopen.h
index c68f4a2aded8..7871b13c183f 100644
--- a/compat/flopen.h
+++ b/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/compat/pidfile.h b/compat/pidfile.h
index c3a259ba0801..5286b6999b29 100644
--- a/compat/pidfile.h
+++ b/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/compat/queue.h b/compat/queue.h
index a73a1f7ad83b..4236e62c596e 100644
--- a/compat/queue.h
+++ b/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/compat/strlcat.h b/compat/strlcat.h
index f10109bb189a..70a851c9a923 100644
--- a/compat/strlcat.h
+++ b/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/compat/strlcpy.h b/compat/strlcpy.h
index 2f6455d12e9f..1d206b6eac1a 100644
--- a/compat/strlcpy.h
+++ b/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/configure b/configure
index 197a9bec8259..14ae32067622 100755
--- a/configure
+++ b/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/configure.ac b/configure.ac
index d1764879ec17..19762e4517e7 100644
--- a/configure.ac
+++ b/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/etc/audit_class b/etc/audit_class
index 0b215c84e6f8..4fdb14efeea0 100644
--- a/etc/audit_class
+++ b/etc/audit_class
@@ -1,6 +1,3 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#6 $
-#
 0x00000000:no:invalid class
 0x00000001:fr:file read
 0x00000002:fw:file write
diff --git a/etc/audit_control b/etc/audit_control
index 1566628597ab..aec726820f1e 100644
--- a/etc/audit_control
+++ b/etc/audit_control
@@ -1,6 +1,3 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#9 $
-#
 dir:/var/audit
 dist:off
 flags:lo,aa
diff --git a/etc/audit_event b/etc/audit_event
index 223a83a4c408..c6ed6002494c 100644
--- a/etc/audit_event
+++ b/etc/audit_event
@@ -1,6 +1,3 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $
-#
 # The mapping between event identifiers and values is also hard-coded in
 # audit_kevents.h and audit_uevents.h, so changes must occur in both places,
 # and programs, such as the kernel, may need to be recompiled to recognize
@@ -547,7 +544,7 @@
 43184:AUE_OPENAT:openat(2) - attr only:fa
 43185:AUE_POSIX_OPENPT:posix_openpt(2):ip
 43186:AUE_CAP_NEW:cap_new(2):fm
-43187:AUE_CAP_GETRIGHTS:cap_getrights(2):fm
+43187:AUE_CAP_RIGHTS_GET:cap_rights_get(2):fm
 43188:AUE_CAP_ENTER:cap_enter(2):pc
 43189:AUE_CAP_GETMODE:cap_getmode(2):pc
 43190:AUE_POSIX_SPAWN:posix_spawn(2):pc
@@ -562,6 +559,14 @@
 43199:AUE_PDGETPID:pdgetpid(2):pc
 43200:AUE_PDWAIT:pdwait(2):pc
 43201:AUE_WAIT6:wait6(2):pc
+43202:AUE_CAP_RIGHTS_LIMIT:cap_rights_limit(2):fm
+43203:AUE_CAP_IOCTLS_LIMIT:cap_ioctls_limit(2):fm
+43204:AUE_CAP_IOCTLS_GET:cap_ioctls_get(2):fm
+43205:AUE_CAP_FCNTLS_LIMIT:cap_fcntls_limit(2):fm
+43206:AUE_CAP_FCNTLS_GET:cap_fcntls_get(2):fm
+43207:AUE_BINDAT:bindat(2):nt
+43208:AUE_CONNECTAT:connectat(2):nt
+43209:AUE_CHFLAGSAT:chflagsat(2):fm
 #
 # Solaris userspace events.
 #
diff --git a/etc/audit_filter b/etc/audit_filter
index 64f5c0e04d94..8e3fa719d232 100644
--- a/etc/audit_filter
+++ b/etc/audit_filter
@@ -1,5 +1,2 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_filter#1 $
-#
 # modulename:various arguments here
 #
diff --git a/etc/audit_user b/etc/audit_user
index 7b92f065b404..303b0c137efd 100644
--- a/etc/audit_user
+++ b/etc/audit_user
@@ -1,4 +1 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#3 $
-#
 root:lo:no
diff --git a/etc/audit_warn b/etc/audit_warn
index 3612fc9227e2..8feb0fa4954f 100644
--- a/etc/audit_warn
+++ b/etc/audit_warn
@@ -1,5 +1,3 @@
 #!/bin/sh
-#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $
-#
+
 logger -p security.warning "audit warning: $@"
diff --git a/libauditd/Makefile.am b/libauditd/Makefile.am
index 3a4e7abdc7b0..c6e09aa4d8a5 100644
--- a/libauditd/Makefile.am
+++ b/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/libauditd/auditd_lib.c b/libauditd/auditd_lib.c
index 3c033487fafd..6079df05318e 100644
--- a/libauditd/auditd_lib.c
+++ b/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/libauditd/libauditd.3 b/libauditd/libauditd.3
index 0fece29b3d67..06c524606a2c 100644
--- a/libauditd/libauditd.3
+++ b/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/libbsm/Makefile.am b/libbsm/Makefile.am
index bfad93b5a735..278f22883105 100644
--- a/libbsm/Makefile.am
+++ b/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/libbsm/Makefile.in b/libbsm/Makefile.in
index 956d66f7787d..0549153472a5 100644
--- a/libbsm/Makefile.in
+++ b/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/libbsm/au_class.3 b/libbsm/au_class.3
index a3f200f92c67..acdac62dc5aa 100644
--- a/libbsm/au_class.3
+++ b/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/libbsm/au_control.3 b/libbsm/au_control.3
index 622fae21df3f..d4d445026471 100644
--- a/libbsm/au_control.3
+++ b/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/libbsm/au_domain.3 b/libbsm/au_domain.3
index 6d57d2b53042..2f16b3848151 100644
--- a/libbsm/au_domain.3
+++ b/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/libbsm/au_errno.3 b/libbsm/au_errno.3
index 3680a4ee3e0d..93873cec7323 100644
--- a/libbsm/au_errno.3
+++ b/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/libbsm/au_event.3 b/libbsm/au_event.3
index 8fe25b45e956..781ba1b822b4 100644
--- a/libbsm/au_event.3
+++ b/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/libbsm/au_fcntl_cmd.3 b/libbsm/au_fcntl_cmd.3
index 7843c94efb90..a87c3ec39ebd 100644
--- a/libbsm/au_fcntl_cmd.3
+++ b/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/libbsm/au_free_token.3 b/libbsm/au_free_token.3
index 223d50a1a551..882064579479 100644
--- a/libbsm/au_free_token.3
+++ b/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/libbsm/au_io.3 b/libbsm/au_io.3
index bd8e5a12066a..bfea1a86639f 100644
--- a/libbsm/au_io.3
+++ b/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/libbsm/au_mask.3 b/libbsm/au_mask.3
index 28452796cb1a..c2099ea13994 100644
--- a/libbsm/au_mask.3
+++ b/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/libbsm/au_notify.3 b/libbsm/au_notify.3
new file mode 100644
index 000000000000..06e63bfa755f
--- /dev/null
+++ b/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/libbsm/au_open.3 b/libbsm/au_open.3
index bbb0eca8dda9..522354f32063 100644
--- a/libbsm/au_open.3
+++ b/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/libbsm/au_socket_type.3 b/libbsm/au_socket_type.3
index 174e5c70dcd8..5668569f7b4d 100644
--- a/libbsm/au_socket_type.3
+++ b/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/libbsm/au_token.3 b/libbsm/au_token.3
index 2888729e1eea..045924242e7d 100644
--- a/libbsm/au_token.3
+++ b/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/libbsm/au_user.3 b/libbsm/au_user.3
index 3016f65b10d9..d2a4fa115e29 100644
--- a/libbsm/au_user.3
+++ b/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/libbsm/audit_submit.3 b/libbsm/audit_submit.3
index ab1fc64be429..c3be666b365d 100644
--- a/libbsm/audit_submit.3
+++ b/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/libbsm/bsm_audit.c b/libbsm/bsm_audit.c
index 693419f32e8e..f7a00c6fa651 100644
--- a/libbsm/bsm_audit.c
+++ b/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/libbsm/bsm_class.c b/libbsm/bsm_class.c
index 358afbb85acb..8ee193fedb54 100644
--- a/libbsm/bsm_class.c
+++ b/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/libbsm/bsm_control.c b/libbsm/bsm_control.c
index baaa0a5f48b2..94d94206b79c 100644
--- a/libbsm/bsm_control.c
+++ b/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/libbsm/bsm_domain.c b/libbsm/bsm_domain.c
index 2b011f5a2ac3..f6aeef69036f 100644
--- a/libbsm/bsm_domain.c
+++ b/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/libbsm/bsm_errno.c b/libbsm/bsm_errno.c
index 8682fc784e73..b4b22f3e845e 100644
--- a/libbsm/bsm_errno.c
+++ b/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/libbsm/bsm_event.c b/libbsm/bsm_event.c
index f3c660168bf7..5499083d4819 100644
--- a/libbsm/bsm_event.c
+++ b/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/libbsm/bsm_fcntl.c b/libbsm/bsm_fcntl.c
index 41b6d0d600c4..45ae5da19df1 100644
--- a/libbsm/bsm_fcntl.c
+++ b/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/libbsm/bsm_flags.c b/libbsm/bsm_flags.c
index c87ae842a587..46b8a1fc53fe 100644
--- a/libbsm/bsm_flags.c
+++ b/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/libbsm/bsm_io.c b/libbsm/bsm_io.c
index 85fab590b402..43cf7e9990c1 100644
--- a/libbsm/bsm_io.c
+++ b/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 ");
@@ -949,7 +948,7 @@ print_header32_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags)
 {
 
 	print_tok_type(fp, tok->id, "header", oflags);
-	if (oflags & AU_OFLAG_RAW) {
+	if (oflags & AU_OFLAG_XML) {
 		open_attr(fp, "version");
 		print_1_byte(fp, tok->tt.hdr32.version, "%u");
 		close_attr(fp);
diff --git a/libbsm/bsm_mask.c b/libbsm/bsm_mask.c
index afbed5e3f7b2..42e4e71c09c8 100644
--- a/libbsm/bsm_mask.c
+++ b/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/libbsm/bsm_notify.c b/libbsm/bsm_notify.c
index df972aaf0430..a2dda74ab628 100644
--- a/libbsm/bsm_notify.c
+++ b/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/libbsm/bsm_socket_type.c b/libbsm/bsm_socket_type.c
index a10b60905491..ffbe39e3b408 100644
--- a/libbsm/bsm_socket_type.c
+++ b/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/libbsm/bsm_token.c b/libbsm/bsm_token.c
index a6b975d04d1b..682836f43870 100644
--- a/libbsm/bsm_token.c
+++ b/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/libbsm/bsm_user.c b/libbsm/bsm_user.c
index c7464f04b7bd..5b4807004ecf 100644
--- a/libbsm/bsm_user.c
+++ b/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/libbsm/bsm_wrappers.c b/libbsm/bsm_wrappers.c
index 2d24a0ce0f69..01daaf1421e8 100644
--- a/libbsm/bsm_wrappers.c
+++ b/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/libbsm/libbsm.3 b/libbsm/libbsm.3
index 151e0488d5a1..d84e77461bb2 100644
--- a/libbsm/libbsm.3
+++ b/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/man/Makefile.am b/man/Makefile.am
index ad1802e0f605..26e89f672b5b 100644
--- a/man/Makefile.am
+++ b/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/man/Makefile.in b/man/Makefile.in
index 56772f2ddbaa..bd416e2b2296 100644
--- a/man/Makefile.in
+++ b/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/man/audit.2 b/man/audit.2
index 1ee61b9f0def..d64dfe975176 100644
--- a/man/audit.2
+++ b/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/man/audit.log.5 b/man/audit.log.5
index fd5289620ea9..d85fdccb2bf0 100644
--- a/man/audit.log.5
+++ b/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/man/audit_class.5 b/man/audit_class.5
index c92f57f1a2d5..8ea21d31f50c 100644
--- a/man/audit_class.5
+++ b/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/man/audit_control.5 b/man/audit_control.5
index 69ff80c54a7c..30777858028d 100644
--- a/man/audit_control.5
+++ b/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/man/audit_event.5 b/man/audit_event.5
index 184a82d50fcf..1305ef51291c 100644
--- a/man/audit_event.5
+++ b/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/man/audit_user.5 b/man/audit_user.5
index 5075f4a26b57..cac47a3d1222 100644
--- a/man/audit_user.5
+++ b/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/man/audit_warn.5 b/man/audit_warn.5
index c53f163195ad..8734b37b2560 100644
--- a/man/audit_warn.5
+++ b/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/man/auditctl.2 b/man/auditctl.2
index a5346fb853e1..f4b262939bc1 100644
--- a/man/auditctl.2
+++ b/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/man/auditon.2 b/man/auditon.2
index 8b880b7f9125..aa5c760f3fc6 100644
--- a/man/auditon.2
+++ b/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/man/getaudit.2 b/man/getaudit.2
index 5935273ba45e..ae5843d45a25 100644
--- a/man/getaudit.2
+++ b/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/man/getauid.2 b/man/getauid.2
index dc6ae0afa77a..3d28d0f10499 100644
--- a/man/getauid.2
+++ b/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/man/setaudit.2 b/man/setaudit.2
index 41448d64699f..8565b718265d 100644
--- a/man/setaudit.2
+++ b/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/man/setauid.2 b/man/setauid.2
index 770c32b4f91b..11b5dae0e7a9 100644
--- a/man/setauid.2
+++ b/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/modules/Makefile.am b/modules/Makefile.am
index 7d59ec2ea046..c4a3c203b416 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.am#2 $
-##
-
 SUBDIRS =		\
 	auditfilter_noop
 
diff --git a/modules/auditfilter_noop/Makefile.am b/modules/auditfilter_noop/Makefile.am
index 5b432069fa3a..3500fd04413e 100644
--- a/modules/auditfilter_noop/Makefile.am
+++ b/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/modules/auditfilter_noop/auditfilter_noop.c b/modules/auditfilter_noop/auditfilter_noop.c
index 79834d464429..7e2e973be045 100644
--- a/modules/auditfilter_noop/auditfilter_noop.c
+++ b/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/sys/Makefile.am b/sys/Makefile.am
index 17b3afb964bf..0b0261c41687 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/sys/Makefile.am#2 $
-##
-
 SUBDIRS =		\
 	bsm
 
diff --git a/sys/bsm/Makefile.am b/sys/bsm/Makefile.am
index 66e79b17abfb..266243d91d46 100644
--- a/sys/bsm/Makefile.am
+++ b/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/sys/bsm/audit.h b/sys/bsm/audit.h
index bb4a9497b64e..215981301a75 100644
--- a/sys/bsm/audit.h
+++ b/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/sys/bsm/audit_domain.h b/sys/bsm/audit_domain.h
index 3969183292cb..373afa7b4bbc 100644
--- a/sys/bsm/audit_domain.h
+++ b/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/sys/bsm/audit_errno.h b/sys/bsm/audit_errno.h
index abdaff8bf4c2..1c467eedc58c 100644
--- a/sys/bsm/audit_errno.h
+++ b/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/sys/bsm/audit_fcntl.h b/sys/bsm/audit_fcntl.h
index 1398b2f0ddde..708991ebd89f 100644
--- a/sys/bsm/audit_fcntl.h
+++ b/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/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h
index 21176c8cf26c..77d3dbe07cd1 100644
--- a/sys/bsm/audit_internal.h
+++ b/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/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h
index 94e42ab2eb83..3f92b7195647 100644
--- a/sys/bsm/audit_kevents.h
+++ b/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/sys/bsm/audit_record.h b/sys/bsm/audit_record.h
index 2a49cdc6ec56..bd87fe8ab70d 100644
--- a/sys/bsm/audit_record.h
+++ b/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/sys/bsm/audit_socket_type.h b/sys/bsm/audit_socket_type.h
index 85f6aef7ab1c..660ef0fe79bf 100644
--- a/sys/bsm/audit_socket_type.h
+++ b/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/test/Makefile.am b/test/Makefile.am
index 7b936edad9a3..5868349062e0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,2 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.am#3 $
-##
-
 SUBDIRS =		\
 	bsm
diff --git a/test/bsm/Makefile.am b/test/bsm/Makefile.am
index 577e7cb15867..c787f956f9fb 100644
--- a/test/bsm/Makefile.am
+++ b/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/test/bsm/generate.c b/test/bsm/generate.c
index bbc81bb8ca63..3416fa35b455 100644
--- a/test/bsm/generate.c
+++ b/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/tools/Makefile.am b/tools/Makefile.am
index 13aa10df6836..47ef3cb4269c 100644
--- a/tools/Makefile.am
+++ b/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/tools/audump.c b/tools/audump.c
index 82d17ea21baa..cdb8ed1165a6 100644
--- a/tools/audump.c
+++ b/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>