svn commit: r292016 - in vendor/openbsm/dist: . bin bin/audit bin/auditd bin/auditdistd bin/auditfilterd bin/auditreduce bin/praudit bsm compat etc libauditd libbsm man modules modules/auditfilter_...

Christian Brueffer brueffer at FreeBSD.org
Wed Dec 9 12:16:28 UTC 2015 

Author: brueffer
Date: Wed Dec  9 12:16:21 2015
New Revision: 292016
URL: https://svnweb.freebsd.org/changeset/base/292016

Log:
  Vendor import of OpenBSM 1.2-alpha4.

Added:
  vendor/openbsm/dist/.travis.yml   (contents, props changed)
  vendor/openbsm/dist/libbsm/au_notify.3   (contents, props changed)
Modified:
  vendor/openbsm/dist/INSTALL
  vendor/openbsm/dist/LICENSE
  vendor/openbsm/dist/Makefile.am
  vendor/openbsm/dist/Makefile.in
  vendor/openbsm/dist/NEWS
  vendor/openbsm/dist/README
  vendor/openbsm/dist/TODO
  vendor/openbsm/dist/VERSION
  vendor/openbsm/dist/autogen.sh
  vendor/openbsm/dist/bin/Makefile.am
  vendor/openbsm/dist/bin/audit/Makefile.am
  vendor/openbsm/dist/bin/audit/audit.8
  vendor/openbsm/dist/bin/audit/audit.c
  vendor/openbsm/dist/bin/auditd/Makefile.am
  vendor/openbsm/dist/bin/auditd/audit_triggers.defs
  vendor/openbsm/dist/bin/auditd/audit_warn.c
  vendor/openbsm/dist/bin/auditd/auditd.8
  vendor/openbsm/dist/bin/auditd/auditd.c
  vendor/openbsm/dist/bin/auditd/auditd.h
  vendor/openbsm/dist/bin/auditd/auditd_control.defs
  vendor/openbsm/dist/bin/auditd/auditd_darwin.c
  vendor/openbsm/dist/bin/auditd/auditd_fbsd.c
  vendor/openbsm/dist/bin/auditdistd/Makefile.am
  vendor/openbsm/dist/bin/auditdistd/auditdistd.8
  vendor/openbsm/dist/bin/auditdistd/auditdistd.c
  vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5
  vendor/openbsm/dist/bin/auditdistd/auditdistd.h
  vendor/openbsm/dist/bin/auditdistd/faccessat.h
  vendor/openbsm/dist/bin/auditdistd/fstatat.h
  vendor/openbsm/dist/bin/auditdistd/openat.h
  vendor/openbsm/dist/bin/auditdistd/parse.y
  vendor/openbsm/dist/bin/auditdistd/pjdlog.c
  vendor/openbsm/dist/bin/auditdistd/pjdlog.h
  vendor/openbsm/dist/bin/auditdistd/proto.c
  vendor/openbsm/dist/bin/auditdistd/proto.h
  vendor/openbsm/dist/bin/auditdistd/proto_common.c
  vendor/openbsm/dist/bin/auditdistd/proto_impl.h
  vendor/openbsm/dist/bin/auditdistd/proto_socketpair.c
  vendor/openbsm/dist/bin/auditdistd/proto_tcp.c
  vendor/openbsm/dist/bin/auditdistd/proto_tls.c
  vendor/openbsm/dist/bin/auditdistd/proto_uds.c
  vendor/openbsm/dist/bin/auditdistd/receiver.c
  vendor/openbsm/dist/bin/auditdistd/renameat.h
  vendor/openbsm/dist/bin/auditdistd/sandbox.c
  vendor/openbsm/dist/bin/auditdistd/sandbox.h
  vendor/openbsm/dist/bin/auditdistd/sender.c
  vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h
  vendor/openbsm/dist/bin/auditdistd/strndup.h
  vendor/openbsm/dist/bin/auditdistd/subr.c
  vendor/openbsm/dist/bin/auditdistd/subr.h
  vendor/openbsm/dist/bin/auditdistd/synch.h
  vendor/openbsm/dist/bin/auditdistd/token.l
  vendor/openbsm/dist/bin/auditdistd/trail.c
  vendor/openbsm/dist/bin/auditdistd/trail.h
  vendor/openbsm/dist/bin/auditdistd/unlinkat.h
  vendor/openbsm/dist/bin/auditfilterd/Makefile.am
  vendor/openbsm/dist/bin/auditfilterd/auditfilterd.8
  vendor/openbsm/dist/bin/auditfilterd/auditfilterd.c
  vendor/openbsm/dist/bin/auditfilterd/auditfilterd.h
  vendor/openbsm/dist/bin/auditfilterd/auditfilterd_conf.c
  vendor/openbsm/dist/bin/auditreduce/Makefile.am
  vendor/openbsm/dist/bin/auditreduce/auditreduce.1
  vendor/openbsm/dist/bin/auditreduce/auditreduce.c
  vendor/openbsm/dist/bin/auditreduce/auditreduce.h
  vendor/openbsm/dist/bin/praudit/Makefile.am
  vendor/openbsm/dist/bin/praudit/praudit.1
  vendor/openbsm/dist/bin/praudit/praudit.c
  vendor/openbsm/dist/bsm/Makefile.am
  vendor/openbsm/dist/bsm/audit_filter.h
  vendor/openbsm/dist/bsm/audit_uevents.h
  vendor/openbsm/dist/bsm/auditd_lib.h
  vendor/openbsm/dist/bsm/libbsm.h
  vendor/openbsm/dist/compat/clock_gettime.h
  vendor/openbsm/dist/compat/closefrom.h
  vendor/openbsm/dist/compat/compat.h
  vendor/openbsm/dist/compat/endian.h
  vendor/openbsm/dist/compat/endian_enc.h
  vendor/openbsm/dist/compat/flopen.h
  vendor/openbsm/dist/compat/pidfile.h
  vendor/openbsm/dist/compat/queue.h
  vendor/openbsm/dist/compat/strlcat.h
  vendor/openbsm/dist/compat/strlcpy.h
  vendor/openbsm/dist/configure
  vendor/openbsm/dist/configure.ac
  vendor/openbsm/dist/etc/audit_class
  vendor/openbsm/dist/etc/audit_control
  vendor/openbsm/dist/etc/audit_event
  vendor/openbsm/dist/etc/audit_filter
  vendor/openbsm/dist/etc/audit_user
  vendor/openbsm/dist/etc/audit_warn
  vendor/openbsm/dist/libauditd/Makefile.am
  vendor/openbsm/dist/libauditd/auditd_lib.c
  vendor/openbsm/dist/libauditd/libauditd.3
  vendor/openbsm/dist/libbsm/Makefile.am
  vendor/openbsm/dist/libbsm/Makefile.in
  vendor/openbsm/dist/libbsm/au_class.3
  vendor/openbsm/dist/libbsm/au_control.3
  vendor/openbsm/dist/libbsm/au_domain.3
  vendor/openbsm/dist/libbsm/au_errno.3
  vendor/openbsm/dist/libbsm/au_event.3
  vendor/openbsm/dist/libbsm/au_fcntl_cmd.3
  vendor/openbsm/dist/libbsm/au_free_token.3
  vendor/openbsm/dist/libbsm/au_io.3
  vendor/openbsm/dist/libbsm/au_mask.3
  vendor/openbsm/dist/libbsm/au_open.3
  vendor/openbsm/dist/libbsm/au_socket_type.3
  vendor/openbsm/dist/libbsm/au_token.3
  vendor/openbsm/dist/libbsm/au_user.3
  vendor/openbsm/dist/libbsm/audit_submit.3
  vendor/openbsm/dist/libbsm/bsm_audit.c
  vendor/openbsm/dist/libbsm/bsm_class.c
  vendor/openbsm/dist/libbsm/bsm_control.c
  vendor/openbsm/dist/libbsm/bsm_domain.c
  vendor/openbsm/dist/libbsm/bsm_errno.c
  vendor/openbsm/dist/libbsm/bsm_event.c
  vendor/openbsm/dist/libbsm/bsm_fcntl.c
  vendor/openbsm/dist/libbsm/bsm_flags.c
  vendor/openbsm/dist/libbsm/bsm_io.c
  vendor/openbsm/dist/libbsm/bsm_mask.c
  vendor/openbsm/dist/libbsm/bsm_notify.c
  vendor/openbsm/dist/libbsm/bsm_socket_type.c
  vendor/openbsm/dist/libbsm/bsm_token.c
  vendor/openbsm/dist/libbsm/bsm_user.c
  vendor/openbsm/dist/libbsm/bsm_wrappers.c
  vendor/openbsm/dist/libbsm/libbsm.3
  vendor/openbsm/dist/man/Makefile.am
  vendor/openbsm/dist/man/Makefile.in
  vendor/openbsm/dist/man/audit.2
  vendor/openbsm/dist/man/audit.log.5
  vendor/openbsm/dist/man/audit_class.5
  vendor/openbsm/dist/man/audit_control.5
  vendor/openbsm/dist/man/audit_event.5
  vendor/openbsm/dist/man/audit_user.5
  vendor/openbsm/dist/man/audit_warn.5
  vendor/openbsm/dist/man/auditctl.2
  vendor/openbsm/dist/man/auditon.2
  vendor/openbsm/dist/man/getaudit.2
  vendor/openbsm/dist/man/getauid.2
  vendor/openbsm/dist/man/setaudit.2
  vendor/openbsm/dist/man/setauid.2
  vendor/openbsm/dist/modules/Makefile.am
  vendor/openbsm/dist/modules/auditfilter_noop/Makefile.am
  vendor/openbsm/dist/modules/auditfilter_noop/auditfilter_noop.c
  vendor/openbsm/dist/sys/Makefile.am
  vendor/openbsm/dist/sys/bsm/Makefile.am
  vendor/openbsm/dist/sys/bsm/audit.h
  vendor/openbsm/dist/sys/bsm/audit_domain.h
  vendor/openbsm/dist/sys/bsm/audit_errno.h
  vendor/openbsm/dist/sys/bsm/audit_fcntl.h
  vendor/openbsm/dist/sys/bsm/audit_internal.h
  vendor/openbsm/dist/sys/bsm/audit_kevents.h
  vendor/openbsm/dist/sys/bsm/audit_record.h
  vendor/openbsm/dist/sys/bsm/audit_socket_type.h
  vendor/openbsm/dist/test/Makefile.am
  vendor/openbsm/dist/test/bsm/Makefile.am
  vendor/openbsm/dist/test/bsm/generate.c
  vendor/openbsm/dist/tools/Makefile.am
  vendor/openbsm/dist/tools/audump.c

Added: vendor/openbsm/dist/.travis.yml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/openbsm/dist/.travis.yml	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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

Modified: vendor/openbsm/dist/INSTALL
==============================================================================
--- vendor/openbsm/dist/INSTALL	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/INSTALL	Wed Dec  9 12:16:21 2015	(r292016)
@@ -3,7 +3,7 @@ OpenBSM Build and Installation Instructi
 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

Modified: vendor/openbsm/dist/LICENSE
==============================================================================
--- vendor/openbsm/dist/LICENSE	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/LICENSE	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 $

Modified: vendor/openbsm/dist/Makefile.am
==============================================================================
--- vendor/openbsm/dist/Makefile.am	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/Makefile.am	Wed Dec  9 12:16:21 2015	(r292016)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $
-##
-
 SUBDIRS =		\
 	bsm
 

Modified: vendor/openbsm/dist/Makefile.in
==============================================================================
--- vendor/openbsm/dist/Makefile.in	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/Makefile.in	Wed Dec  9 12:16:21 2015	(r292016)
@@ -59,9 +59,9 @@ DIST_COMMON = README $(am__configure_dep
 	$(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) \

Modified: vendor/openbsm/dist/NEWS
==============================================================================
--- vendor/openbsm/dist/NEWS	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/NEWS	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 $

Modified: vendor/openbsm/dist/README
==============================================================================
--- vendor/openbsm/dist/README	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/README	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 t
 Information on TrustedBSD may be found on the TrustedBSD home page:
 
     http://www.TrustedBSD.org/
-
-$P4: //depot/projects/trustedbsd/openbsm/README#41 $

Modified: vendor/openbsm/dist/TODO
==============================================================================
--- vendor/openbsm/dist/TODO	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/TODO	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 $

Modified: vendor/openbsm/dist/VERSION
==============================================================================
--- vendor/openbsm/dist/VERSION	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/VERSION	Wed Dec  9 12:16:21 2015	(r292016)
@@ -1 +1 @@
-OPENBSM_1_2_alpha3
+OPENBSM_1_2_alpha4

Modified: vendor/openbsm/dist/autogen.sh
==============================================================================
--- vendor/openbsm/dist/autogen.sh	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/autogen.sh	Wed Dec  9 12:16:21 2015	(r292016)
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $
-#
 
 libtoolize --copy --force
 aclocal

Modified: vendor/openbsm/dist/bin/Makefile.am
==============================================================================
--- vendor/openbsm/dist/bin/Makefile.am	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/Makefile.am	Wed Dec  9 12:16:21 2015	(r292016)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $
-##
-
 SUBDIRS =		\
 	auditdistd	\
 	auditfilterd	\

Modified: vendor/openbsm/dist/bin/audit/Makefile.am
==============================================================================
--- vendor/openbsm/dist/bin/audit/Makefile.am	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/audit/Makefile.am	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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

Modified: vendor/openbsm/dist/bin/audit/audit.8
==============================================================================
--- vendor/openbsm/dist/bin/audit/audit.8	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/audit/audit.8	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 
 .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.

Modified: vendor/openbsm/dist/bin/audit/audit.c
==============================================================================
--- vendor/openbsm/dist/bin/audit/audit.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/audit/audit.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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:

Modified: vendor/openbsm/dist/bin/auditd/Makefile.am
==============================================================================
--- vendor/openbsm/dist/bin/auditd/Makefile.am	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/Makefile.am	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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

Modified: vendor/openbsm/dist/bin/auditd/audit_triggers.defs
==============================================================================
--- vendor/openbsm/dist/bin/auditd/audit_triggers.defs	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/audit_triggers.defs	Wed Dec  9 12:16:21 2015	(r292016)
@@ -1,5 +1 @@
-/*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 $
- */
-
 #include <mach/audit_triggers.defs>

Modified: vendor/openbsm/dist/bin/auditd/audit_warn.c
==============================================================================
--- vendor/openbsm/dist/bin/auditd/audit_warn.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/audit_warn.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditd/auditd.8
==============================================================================
--- vendor/openbsm/dist/bin/auditd/auditd.8	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/auditd.8	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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
 .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.

Modified: vendor/openbsm/dist/bin/auditd/auditd.c
==============================================================================
--- vendor/openbsm/dist/bin/auditd/auditd.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/auditd.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditd/auditd.h
==============================================================================
--- vendor/openbsm/dist/bin/auditd/auditd.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/auditd.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditd/auditd_control.defs
==============================================================================
--- vendor/openbsm/dist/bin/auditd/auditd_control.defs	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/auditd_control.defs	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 $
  */
 
 /*

Modified: vendor/openbsm/dist/bin/auditd/auditd_darwin.c
==============================================================================
--- vendor/openbsm/dist/bin/auditd/auditd_darwin.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/auditd_darwin.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditd/auditd_fbsd.c
==============================================================================
--- vendor/openbsm/dist/bin/auditd/auditd_fbsd.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditd/auditd_fbsd.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/Makefile.am
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/Makefile.am	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/Makefile.am	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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

Modified: vendor/openbsm/dist/bin/auditdistd/auditdistd.8
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/auditdistd.8	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/auditdistd.8	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 .

Modified: vendor/openbsm/dist/bin/auditdistd/auditdistd.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/auditdistd.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/auditdistd.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 at dawidek.net
 under sponsorship of the FreeBSD Foundation.

Modified: vendor/openbsm/dist/bin/auditdistd/auditdistd.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/auditdistd.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/auditdistd.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/faccessat.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/faccessat.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/faccessat.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/fstatat.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/fstatat.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/fstatat.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/openat.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/openat.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/openat.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/parse.y
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/parse.y	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/parse.y	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/pjdlog.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/pjdlog.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/pjdlog.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/pjdlog.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/pjdlog.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/pjdlog.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/proto.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/proto.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/proto_common.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_common.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto_common.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/proto_impl.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_impl.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto_impl.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/proto_socketpair.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_socketpair.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto_socketpair.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/proto_tcp.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_tcp.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto_tcp.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/proto_tls.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_tls.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto_tls.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/proto_uds.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/proto_uds.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/proto_uds.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 */

Modified: vendor/openbsm/dist/bin/auditdistd/receiver.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/receiver.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/receiver.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/renameat.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/renameat.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/renameat.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/sandbox.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/sandbox.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/sandbox.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/sandbox.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/sandbox.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/sandbox.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/sender.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/sender.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/sender.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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);

Modified: vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/sigtimedwait.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/strndup.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/strndup.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/strndup.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/subr.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/subr.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/subr.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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");

Modified: vendor/openbsm/dist/bin/auditdistd/subr.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/subr.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/subr.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/synch.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/synch.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/synch.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/token.l
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/token.l	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/token.l	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 */;

Modified: vendor/openbsm/dist/bin/auditdistd/trail.c
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/trail.c	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/trail.c	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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>

Modified: vendor/openbsm/dist/bin/auditdistd/trail.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/trail.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/trail.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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_

Modified: vendor/openbsm/dist/bin/auditdistd/unlinkat.h
==============================================================================
--- vendor/openbsm/dist/bin/auditdistd/unlinkat.h	Wed Dec  9 11:14:27 2015	(r292015)
+++ vendor/openbsm/dist/bin/auditdistd/unlinkat.h	Wed Dec  9 12:16:21 2015	(r292016)
@@ -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 OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-vendor mailing list