[Midnightbsd-cvs] src [11165] trunk/contrib/openbsm/tools/audump.c: 1.2alpha4

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jun 27 18:43:22 EDT 2018


Revision: 11165
          http://svnweb.midnightbsd.org/src/?rev=11165
Author:   laffer1
Date:     2018-06-27 18:43:21 -0400 (Wed, 27 Jun 2018)
Log Message:
-----------
1.2alpha4

Modified Paths:
--------------
    trunk/contrib/openbsm/LICENSE
    trunk/contrib/openbsm/Makefile.am
    trunk/contrib/openbsm/Makefile.in
    trunk/contrib/openbsm/README
    trunk/contrib/openbsm/TODO
    trunk/contrib/openbsm/VERSION
    trunk/contrib/openbsm/autogen.sh
    trunk/contrib/openbsm/bin/Makefile.am
    trunk/contrib/openbsm/bin/audit/Makefile.am
    trunk/contrib/openbsm/bin/audit/audit.8
    trunk/contrib/openbsm/bin/audit/audit.c
    trunk/contrib/openbsm/bin/auditd/Makefile.am
    trunk/contrib/openbsm/bin/auditd/audit_warn.c
    trunk/contrib/openbsm/bin/auditd/auditd.8
    trunk/contrib/openbsm/bin/auditd/auditd.c
    trunk/contrib/openbsm/bin/auditd/auditd.h
    trunk/contrib/openbsm/bin/auditfilterd/Makefile.am
    trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.8
    trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.c
    trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.h
    trunk/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
    trunk/contrib/openbsm/bin/auditreduce/Makefile.am
    trunk/contrib/openbsm/bin/auditreduce/auditreduce.1
    trunk/contrib/openbsm/bin/auditreduce/auditreduce.c
    trunk/contrib/openbsm/bin/auditreduce/auditreduce.h
    trunk/contrib/openbsm/bin/praudit/Makefile.am
    trunk/contrib/openbsm/bin/praudit/praudit.1
    trunk/contrib/openbsm/bin/praudit/praudit.c
    trunk/contrib/openbsm/bsm/Makefile.am
    trunk/contrib/openbsm/bsm/audit_filter.h
    trunk/contrib/openbsm/bsm/audit_uevents.h
    trunk/contrib/openbsm/bsm/libbsm.h
    trunk/contrib/openbsm/compat/clock_gettime.h
    trunk/contrib/openbsm/compat/endian.h
    trunk/contrib/openbsm/compat/queue.h
    trunk/contrib/openbsm/config/config.h
    trunk/contrib/openbsm/configure
    trunk/contrib/openbsm/configure.ac
    trunk/contrib/openbsm/etc/audit_class
    trunk/contrib/openbsm/etc/audit_control
    trunk/contrib/openbsm/etc/audit_event
    trunk/contrib/openbsm/etc/audit_filter
    trunk/contrib/openbsm/etc/audit_user
    trunk/contrib/openbsm/etc/audit_warn
    trunk/contrib/openbsm/libbsm/Makefile.am
    trunk/contrib/openbsm/libbsm/Makefile.in
    trunk/contrib/openbsm/libbsm/au_class.3
    trunk/contrib/openbsm/libbsm/au_control.3
    trunk/contrib/openbsm/libbsm/au_event.3
    trunk/contrib/openbsm/libbsm/au_free_token.3
    trunk/contrib/openbsm/libbsm/au_io.3
    trunk/contrib/openbsm/libbsm/au_mask.3
    trunk/contrib/openbsm/libbsm/au_open.3
    trunk/contrib/openbsm/libbsm/au_token.3
    trunk/contrib/openbsm/libbsm/au_user.3
    trunk/contrib/openbsm/libbsm/audit_submit.3
    trunk/contrib/openbsm/libbsm/bsm_audit.c
    trunk/contrib/openbsm/libbsm/bsm_class.c
    trunk/contrib/openbsm/libbsm/bsm_control.c
    trunk/contrib/openbsm/libbsm/bsm_event.c
    trunk/contrib/openbsm/libbsm/bsm_flags.c
    trunk/contrib/openbsm/libbsm/bsm_io.c
    trunk/contrib/openbsm/libbsm/bsm_mask.c
    trunk/contrib/openbsm/libbsm/bsm_notify.c
    trunk/contrib/openbsm/libbsm/bsm_token.c
    trunk/contrib/openbsm/libbsm/bsm_user.c
    trunk/contrib/openbsm/libbsm/bsm_wrappers.c
    trunk/contrib/openbsm/libbsm/libbsm.3
    trunk/contrib/openbsm/man/Makefile.am
    trunk/contrib/openbsm/man/Makefile.in
    trunk/contrib/openbsm/man/audit.2
    trunk/contrib/openbsm/man/audit.log.5
    trunk/contrib/openbsm/man/audit_class.5
    trunk/contrib/openbsm/man/audit_control.5
    trunk/contrib/openbsm/man/audit_event.5
    trunk/contrib/openbsm/man/audit_user.5
    trunk/contrib/openbsm/man/audit_warn.5
    trunk/contrib/openbsm/man/auditctl.2
    trunk/contrib/openbsm/man/auditon.2
    trunk/contrib/openbsm/man/getaudit.2
    trunk/contrib/openbsm/man/getauid.2
    trunk/contrib/openbsm/man/setaudit.2
    trunk/contrib/openbsm/man/setauid.2
    trunk/contrib/openbsm/modules/Makefile.am
    trunk/contrib/openbsm/modules/auditfilter_noop/Makefile.am
    trunk/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
    trunk/contrib/openbsm/test/Makefile.am
    trunk/contrib/openbsm/test/bsm/Makefile.am
    trunk/contrib/openbsm/test/bsm/generate.c
    trunk/contrib/openbsm/tools/Makefile.am
    trunk/contrib/openbsm/tools/audump.c

Added Paths:
-----------
    trunk/contrib/openbsm/.travis.yml
    trunk/contrib/openbsm/libbsm/au_notify.3

Property Changed:
----------------
    trunk/contrib/openbsm/
    trunk/contrib/openbsm/test/reference/arg32_record
    trunk/contrib/openbsm/test/reference/arg32_token
    trunk/contrib/openbsm/test/reference/data_record
    trunk/contrib/openbsm/test/reference/data_token
    trunk/contrib/openbsm/test/reference/file_record
    trunk/contrib/openbsm/test/reference/file_token
    trunk/contrib/openbsm/test/reference/header32_token
    trunk/contrib/openbsm/test/reference/in_addr_record
    trunk/contrib/openbsm/test/reference/in_addr_token
    trunk/contrib/openbsm/test/reference/ip_record
    trunk/contrib/openbsm/test/reference/ip_token
    trunk/contrib/openbsm/test/reference/ipc_record
    trunk/contrib/openbsm/test/reference/ipc_token
    trunk/contrib/openbsm/test/reference/iport_record
    trunk/contrib/openbsm/test/reference/iport_token
    trunk/contrib/openbsm/test/reference/opaque_record
    trunk/contrib/openbsm/test/reference/opaque_token
    trunk/contrib/openbsm/test/reference/path_record
    trunk/contrib/openbsm/test/reference/path_token
    trunk/contrib/openbsm/test/reference/process32_record
    trunk/contrib/openbsm/test/reference/process32_token
    trunk/contrib/openbsm/test/reference/process32ex_record-IPv4
    trunk/contrib/openbsm/test/reference/process32ex_record-IPv6
    trunk/contrib/openbsm/test/reference/process32ex_token-IPv4
    trunk/contrib/openbsm/test/reference/process32ex_token-IPv6
    trunk/contrib/openbsm/test/reference/process64_record
    trunk/contrib/openbsm/test/reference/process64_token
    trunk/contrib/openbsm/test/reference/process64ex_record-IPv4
    trunk/contrib/openbsm/test/reference/process64ex_record-IPv6
    trunk/contrib/openbsm/test/reference/process64ex_token-IPv4
    trunk/contrib/openbsm/test/reference/process64ex_token-IPv6
    trunk/contrib/openbsm/test/reference/return32_record
    trunk/contrib/openbsm/test/reference/return32_token
    trunk/contrib/openbsm/test/reference/seq_record
    trunk/contrib/openbsm/test/reference/seq_token
    trunk/contrib/openbsm/test/reference/subject32_record
    trunk/contrib/openbsm/test/reference/subject32_token
    trunk/contrib/openbsm/test/reference/subject32ex_record
    trunk/contrib/openbsm/test/reference/subject32ex_token-IPv4
    trunk/contrib/openbsm/test/reference/subject32ex_token-IPv6
    trunk/contrib/openbsm/test/reference/text_record
    trunk/contrib/openbsm/test/reference/text_token
    trunk/contrib/openbsm/test/reference/trailer_token
    trunk/contrib/openbsm/test/reference/zonename_record
    trunk/contrib/openbsm/test/reference/zonename_token

Index: trunk/contrib/openbsm
===================================================================
--- trunk/contrib/openbsm	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/vendor/openbsm/dist:11162-11164
\ No newline at end of property
Copied: trunk/contrib/openbsm/.travis.yml (from rev 11164, vendor/openbsm/dist/.travis.yml)
===================================================================
--- trunk/contrib/openbsm/.travis.yml	                        (rev 0)
+++ trunk/contrib/openbsm/.travis.yml	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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: trunk/contrib/openbsm/LICENSE
===================================================================
--- trunk/contrib/openbsm/LICENSE	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/LICENSE	2018-06-27 22:43:21 UTC (rev 11165)
@@ -34,5 +34,3 @@
 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: trunk/contrib/openbsm/Makefile.am
===================================================================
--- trunk/contrib/openbsm/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $
-##
-
 SUBDIRS =		\
 	bsm
 

Modified: trunk/contrib/openbsm/Makefile.in
===================================================================
--- trunk/contrib/openbsm/Makefile.in	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/Makefile.in	2018-06-27 22:43:21 UTC (rev 11165)
@@ -59,9 +59,9 @@
 	$(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: trunk/contrib/openbsm/README
===================================================================
--- trunk/contrib/openbsm/README	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/README	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,4 +1,4 @@
-OpenBSM 1.2a2
+OpenBSM
 
   Introduction
 
@@ -10,7 +10,7 @@
 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 TrustedBSD may be found on the TrustedBSD home page:
 
     http://www.TrustedBSD.org/
-
-$P4: //depot/projects/trustedbsd/openbsm/README#41 $

Modified: trunk/contrib/openbsm/TODO
===================================================================
--- trunk/contrib/openbsm/TODO	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/TODO	2018-06-27 22:43:21 UTC (rev 11165)
@@ -7,8 +7,6 @@
 - 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 @@
   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: trunk/contrib/openbsm/VERSION
===================================================================
--- trunk/contrib/openbsm/VERSION	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/VERSION	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1 +1 @@
-OPENBSM_1_2_alpha3
+OPENBSM_1_2_alpha4

Modified: trunk/contrib/openbsm/autogen.sh
===================================================================
--- trunk/contrib/openbsm/autogen.sh	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/autogen.sh	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $
-#
 
 libtoolize --copy --force
 aclocal

Modified: trunk/contrib/openbsm/bin/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bin/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $
-##
-
 SUBDIRS =		\
 	auditdistd	\
 	auditfilterd	\

Modified: trunk/contrib/openbsm/bin/audit/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bin/audit/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/audit/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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: trunk/contrib/openbsm/bin/audit/audit.8
===================================================================
--- trunk/contrib/openbsm/bin/audit/audit.8	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/audit/audit.8	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 @@
 .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: trunk/contrib/openbsm/bin/audit/audit.c
===================================================================
--- trunk/contrib/openbsm/bin/audit/audit.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/audit/audit.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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: trunk/contrib/openbsm/bin/auditd/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bin/auditd/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditd/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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: trunk/contrib/openbsm/bin/auditd/audit_warn.c
===================================================================
--- trunk/contrib/openbsm/bin/auditd/audit_warn.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditd/audit_warn.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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: trunk/contrib/openbsm/bin/auditd/auditd.8
===================================================================
--- trunk/contrib/openbsm/bin/auditd/auditd.8	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditd/auditd.8	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 @@
 .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: trunk/contrib/openbsm/bin/auditd/auditd.c
===================================================================
--- trunk/contrib/openbsm/bin/auditd/auditd.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditd/auditd.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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: trunk/contrib/openbsm/bin/auditd/auditd.h
===================================================================
--- trunk/contrib/openbsm/bin/auditd/auditd.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditd/auditd.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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: trunk/contrib/openbsm/bin/auditfilterd/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bin/auditfilterd/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditfilterd/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.8
===================================================================
--- trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.8	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.8	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.c
===================================================================
--- trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 @@
 }
 
 /*
- * 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. */

Modified: trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.h
===================================================================
--- trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditfilterd/auditfilterd.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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"

Modified: trunk/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
===================================================================
--- trunk/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 $
  */
 
 /*

Modified: trunk/contrib/openbsm/bin/auditreduce/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bin/auditreduce/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditreduce/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/bin/auditreduce/auditreduce.1
===================================================================
--- trunk/contrib/openbsm/bin/auditreduce/auditreduce.1	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditreduce/auditreduce.1	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/bin/auditreduce/auditreduce.c
===================================================================
--- trunk/contrib/openbsm/bin/auditreduce/auditreduce.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditreduce/auditreduce.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 $
  */
 
 /* 

Modified: trunk/contrib/openbsm/bin/auditreduce/auditreduce.h
===================================================================
--- trunk/contrib/openbsm/bin/auditreduce/auditreduce.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/auditreduce/auditreduce.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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_

Modified: trunk/contrib/openbsm/bin/praudit/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bin/praudit/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/praudit/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/bin/praudit/praudit.1
===================================================================
--- trunk/contrib/openbsm/bin/praudit/praudit.1	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/praudit/praudit.1	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/bin/praudit/praudit.c
===================================================================
--- trunk/contrib/openbsm/bin/praudit/praudit.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bin/praudit/praudit.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 $
  */
 
 /*

Modified: trunk/contrib/openbsm/bsm/Makefile.am
===================================================================
--- trunk/contrib/openbsm/bsm/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bsm/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#5 $
-##
-
 openbsmdir = $(includedir)/bsm
 
 openbsm_HEADERS =		\

Modified: trunk/contrib/openbsm/bsm/audit_filter.h
===================================================================
--- trunk/contrib/openbsm/bsm/audit_filter.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bsm/audit_filter.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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_

Modified: trunk/contrib/openbsm/bsm/audit_uevents.h
===================================================================
--- trunk/contrib/openbsm/bsm/audit_uevents.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bsm/audit_uevents.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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_

Modified: trunk/contrib/openbsm/bsm/libbsm.h
===================================================================
--- trunk/contrib/openbsm/bsm/libbsm.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/bsm/libbsm.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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_

Modified: trunk/contrib/openbsm/compat/clock_gettime.h
===================================================================
--- trunk/contrib/openbsm/compat/clock_gettime.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/compat/clock_gettime.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 $
  */
 
 /*

Modified: trunk/contrib/openbsm/compat/endian.h
===================================================================
--- trunk/contrib/openbsm/compat/endian.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/compat/endian.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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_

Modified: trunk/contrib/openbsm/compat/queue.h
===================================================================
--- trunk/contrib/openbsm/compat/queue.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/compat/queue.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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_

Modified: trunk/contrib/openbsm/config/config.h
===================================================================
--- trunk/contrib/openbsm/config/config.h	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/config/config.h	2018-06-27 22:43:21 UTC (rev 11165)
@@ -229,13 +229,13 @@
 #define PACKAGE "OpenBSM"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "trustedbsd-audit at TrustesdBSD.org"
+#define PACKAGE_BUGREPORT "trustedbsd-audit at TrustedBSD.org"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "OpenBSM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenBSM 1.2-alpha3"
+#define PACKAGE_STRING "OpenBSM 1.2-alpha4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openbsm"
@@ -244,7 +244,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2-alpha3"
+#define PACKAGE_VERSION "1.2-alpha4"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -280,7 +280,7 @@
 #define USE_SYS_ENDIAN_H /**/
 
 /* Version number of package */
-#define VERSION "1.2-alpha3"
+#define VERSION "1.2-alpha4"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */

Modified: trunk/contrib/openbsm/configure
===================================================================
--- trunk/contrib/openbsm/configure	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/configure	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 at TrustesdBSD.org>.
+# Report bugs to <trustedbsd-audit at TrustedBSD.org>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -276,7 +275,7 @@
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: trustedbsd-audit at TrustesdBSD.org about your system,
+$0: trustedbsd-audit at 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,10 +590,11 @@
 # 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 at TrustesdBSD.org'
+PACKAGE_VERSION='1.2-alpha4'
+PACKAGE_STRING='OpenBSM 1.2-alpha4'
+PACKAGE_BUGREPORT='trustedbsd-audit at TrustedBSD.org'
 PACKAGE_URL=''
+PACKAGE_URL=''
 
 ac_unique_file="bin/auditreduce/auditreduce.c"
 # Factoring default headers for most tests.
@@ -1327,7 +1327,7 @@
   # 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 +1397,7 @@
 
 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 +1448,7 @@
 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 at TrustesdBSD.org>.
+Report bugs to <trustedbsd-audit at TrustedBSD.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1511,7 +1511,7 @@
 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 +1856,9 @@
 $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 at TrustesdBSD.org ##
-## ----------------------------------------------- ##"
+( $as_echo "## ---------------------------------------------- ##
+## Report this to trustedbsd-audit at TrustedBSD.org ##
+## ---------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -1991,7 +1991,7 @@
 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 $@
@@ -11132,6 +11132,17 @@
 # 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 +11563,7 @@
 # Define the identity of the package.
 
  PACKAGE=OpenBSM
- VERSION=1.2-alpha3
+ VERSION=1.2-alpha4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14174,7 +14185,7 @@
 # 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 +14245,13 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <trustedbsd-audit at TrustesdBSD.org>."
+Report bugs to <trustedbsd-audit at 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\\"
 

Modified: trunk/contrib/openbsm/configure.ac
===================================================================
--- trunk/contrib/openbsm/configure.ac	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/configure.ac	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $])
+AC_INIT([OpenBSM], [1.2-alpha4], [trustedbsd-audit at 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_INSTALL
 AC_PROG_LEX
 AC_PROG_LIBTOOL
+AC_PROG_LN_S
 AC_PROG_YACC
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: trunk/contrib/openbsm/etc/audit_class
===================================================================
--- trunk/contrib/openbsm/etc/audit_class	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/etc/audit_class	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,6 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#6 $
-# $FreeBSD: release/9.2.0/contrib/openbsm/etc/audit_class 191273 2009-04-19 16:17:13Z rwatson $
+# $FreeBSD: stable/10/contrib/openbsm/etc/audit_class 293161 2016-01-04 16:32:21Z brueffer $
 #
 0x00000000:no:invalid class
 0x00000001:fr:file read

Modified: trunk/contrib/openbsm/etc/audit_control
===================================================================
--- trunk/contrib/openbsm/etc/audit_control	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/etc/audit_control	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,6 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#9 $
-# $FreeBSD: release/9.2.0/contrib/openbsm/etc/audit_control 244390 2012-12-18 09:32:44Z rwatson $
+# $FreeBSD: stable/10/contrib/openbsm/etc/audit_control 293161 2016-01-04 16:32:21Z brueffer $
 #
 dir:/var/audit
 dist:off

Modified: trunk/contrib/openbsm/etc/audit_event
===================================================================
--- trunk/contrib/openbsm/etc/audit_event	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/etc/audit_event	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,6 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $
-# $FreeBSD: release/9.2.0/contrib/openbsm/etc/audit_event 244390 2012-12-18 09:32:44Z rwatson $
+# $FreeBSD: stable/10/contrib/openbsm/etc/audit_event 293161 2016-01-04 16:32:21Z brueffer $
 #
 # 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,
@@ -548,7 +547,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
@@ -563,6 +562,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.
 #

Modified: trunk/contrib/openbsm/etc/audit_filter
===================================================================
--- trunk/contrib/openbsm/etc/audit_filter	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/etc/audit_filter	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,5 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_filter#1 $
+# $FreeBSD: stable/10/contrib/openbsm/etc/audit_filter 293161 2016-01-04 16:32:21Z brueffer $
 #
 # modulename:various arguments here
 #

Modified: trunk/contrib/openbsm/etc/audit_user
===================================================================
--- trunk/contrib/openbsm/etc/audit_user	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/etc/audit_user	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,5 +1,4 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#3 $
-# $FreeBSD: release/9.2.0/contrib/openbsm/etc/audit_user 157137 2006-03-26 01:44:35Z rwatson $
+# $FreeBSD: stable/10/contrib/openbsm/etc/audit_user 293161 2016-01-04 16:32:21Z brueffer $
 #
 root:lo:no

Modified: trunk/contrib/openbsm/etc/audit_warn
===================================================================
--- trunk/contrib/openbsm/etc/audit_warn	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/etc/audit_warn	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $
-# $FreeBSD: release/9.2.0/contrib/openbsm/etc/audit_warn 157137 2006-03-26 01:44:35Z rwatson $
+# $FreeBSD: stable/10/contrib/openbsm/etc/audit_warn 293161 2016-01-04 16:32:21Z brueffer $
 #
+
 logger -p security.warning "audit warning: $@"

Modified: trunk/contrib/openbsm/libbsm/Makefile.am
===================================================================
--- trunk/contrib/openbsm/libbsm/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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,6 +37,7 @@
 	au_free_token.3	\
 	au_io.3		\
 	au_mask.3	\
+	au_notify.3	\
 	au_open.3	\
 	au_socket_type.3	\
 	au_token.3	\
@@ -47,3 +44,114 @@
 	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

Modified: trunk/contrib/openbsm/libbsm/Makefile.in
===================================================================
--- trunk/contrib/openbsm/libbsm/Makefile.in	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/Makefile.in	2018-06-27 22:43:21 UTC (rev 11165)
@@ -269,6 +269,7 @@
 	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-am:
 
 install-exec-am: install-libLTLIBRARIES
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -655,7 +657,7 @@
 
 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 \
@@ -662,8 +664,8 @@
 	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
 
 
+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:

Modified: trunk/contrib/openbsm/libbsm/au_class.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_class.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_class.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/au_control.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_control.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_control.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/au_event.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_event.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_event.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/au_free_token.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_free_token.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_free_token.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 @@
 .Xr audit_write 3
 does, in keeping with the existing memory management model of the BSM API.
 .Sh SEE ALSO
+.Xr au_write 3 ,
 .Xr audit_write 3 ,
-.Xr au_write 3 ,
 .Xr libbsm 3
 .Sh HISTORY
 The OpenBSM implementation was created by McAfee Research, the security

Modified: trunk/contrib/openbsm/libbsm/au_io.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_io.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_io.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/au_mask.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_mask.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_mask.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Copied: trunk/contrib/openbsm/libbsm/au_notify.3 (from rev 11164, vendor/openbsm/dist/libbsm/au_notify.3)
===================================================================
--- trunk/contrib/openbsm/libbsm/au_notify.3	                        (rev 0)
+++ trunk/contrib/openbsm/libbsm/au_notify.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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.

Modified: trunk/contrib/openbsm/libbsm/au_open.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_open.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_open.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/au_token.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_token.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_token.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/au_user.3
===================================================================
--- trunk/contrib/openbsm/libbsm/au_user.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/au_user.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/audit_submit.3
===================================================================
--- trunk/contrib/openbsm/libbsm/audit_submit.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/audit_submit.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/libbsm/bsm_audit.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_audit.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_audit.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_class.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_class.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_class.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_control.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_control.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_control.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_event.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_event.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_event.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_flags.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_flags.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_flags.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_io.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_io.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_io.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 @@
 }
 
 /*
- * Prints the beggining of attribute.
+ * Prints the beginning of an attribute.
  */
 static void
 open_attr(FILE *fp, const char *str)
@@ -278,7 +276,7 @@
 }
 
 /*
- * Prints the end of attribute.
+ * Prints the end of an attribute.
  */
 static void
 close_attr(FILE *fp)
@@ -288,7 +286,7 @@
 }
 
 /*
- * Prints the end of tag.
+ * Prints the end of a tag.
  */
 static void
 close_tag(FILE *fp, u_char type)
@@ -596,6 +594,7 @@
 
 		case AUT_SOCKINET128:
 			fprintf(fp, "<socket-inet6 ");
+			break;
 
 		case AUT_SUBJECT32:
 			fprintf(fp, "<subject ");
@@ -949,7 +948,7 @@
 {
 
 	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);

Modified: trunk/contrib/openbsm/libbsm/bsm_mask.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_mask.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_mask.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_notify.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_notify.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_notify.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 $
  */
 
 /*

Modified: trunk/contrib/openbsm/libbsm/bsm_token.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_token.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_token.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_user.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_user.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_user.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>

Modified: trunk/contrib/openbsm/libbsm/bsm_wrappers.c
===================================================================
--- trunk/contrib/openbsm/libbsm/bsm_wrappers.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/bsm_wrappers.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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__

Modified: trunk/contrib/openbsm/libbsm/libbsm.3
===================================================================
--- trunk/contrib/openbsm/libbsm/libbsm.3	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/libbsm/libbsm.3	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/Makefile.am
===================================================================
--- trunk/contrib/openbsm/man/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.am#2 $
-##
-
 man2_MANS =			\
 	audit.2			\
 	auditctl.2		\
@@ -19,6 +15,7 @@
 	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

Modified: trunk/contrib/openbsm/man/Makefile.in
===================================================================
--- trunk/contrib/openbsm/man/Makefile.in	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/Makefile.in	2018-06-27 22:43:21 UTC (rev 11165)
@@ -473,7 +473,8 @@
 install-dvi-am:
 
 install-exec-am:
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -514,26 +515,28 @@
 
 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
+	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
 
 
-# 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
 
+
 # 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:

Modified: trunk/contrib/openbsm/man/audit.2
===================================================================
--- trunk/contrib/openbsm/man/audit.2	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/audit.2	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/audit.log.5
===================================================================
--- trunk/contrib/openbsm/man/audit.log.5	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/audit.log.5	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/audit_class.5
===================================================================
--- trunk/contrib/openbsm/man/audit_class.5	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/audit_class.5	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/audit_control.5
===================================================================
--- trunk/contrib/openbsm/man/audit_control.5	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/audit_control.5	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/audit_event.5
===================================================================
--- trunk/contrib/openbsm/man/audit_event.5	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/audit_event.5	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/audit_user.5
===================================================================
--- trunk/contrib/openbsm/man/audit_user.5	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/audit_user.5	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/audit_warn.5
===================================================================
--- trunk/contrib/openbsm/man/audit_warn.5	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/audit_warn.5	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/auditctl.2
===================================================================
--- trunk/contrib/openbsm/man/auditctl.2	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/auditctl.2	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/auditon.2
===================================================================
--- trunk/contrib/openbsm/man/auditon.2	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/auditon.2	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/getaudit.2
===================================================================
--- trunk/contrib/openbsm/man/getaudit.2	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/getaudit.2	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/getauid.2
===================================================================
--- trunk/contrib/openbsm/man/getauid.2	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/getauid.2	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/setaudit.2
===================================================================
--- trunk/contrib/openbsm/man/setaudit.2	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/setaudit.2	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/man/setauid.2
===================================================================
--- trunk/contrib/openbsm/man/setauid.2	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/man/setauid.2	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/modules/Makefile.am
===================================================================
--- trunk/contrib/openbsm/modules/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/modules/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,7 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.am#2 $
-##
-
 SUBDIRS =		\
 	auditfilter_noop
 

Modified: trunk/contrib/openbsm/modules/auditfilter_noop/Makefile.am
===================================================================
--- trunk/contrib/openbsm/modules/auditfilter_noop/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/modules/auditfilter_noop/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
===================================================================
--- trunk/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 $
  */
 
 /*

Modified: trunk/contrib/openbsm/test/Makefile.am
===================================================================
--- trunk/contrib/openbsm/test/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -1,6 +1,2 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.am#3 $
-##
-
 SUBDIRS =		\
 	bsm

Modified: trunk/contrib/openbsm/test/bsm/Makefile.am
===================================================================
--- trunk/contrib/openbsm/test/bsm/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/bsm/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/test/bsm/generate.c
===================================================================
--- trunk/contrib/openbsm/test/bsm/generate.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/bsm/generate.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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 $
  */
 
 /*

Index: trunk/contrib/openbsm/test/reference/arg32_record
===================================================================
--- trunk/contrib/openbsm/test/reference/arg32_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/arg32_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/arg32_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/arg32_token
===================================================================
--- trunk/contrib/openbsm/test/reference/arg32_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/arg32_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/arg32_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/data_record
===================================================================
--- trunk/contrib/openbsm/test/reference/data_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/data_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/data_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/data_token
===================================================================
--- trunk/contrib/openbsm/test/reference/data_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/data_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/data_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/file_record
===================================================================
--- trunk/contrib/openbsm/test/reference/file_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/file_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/file_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/file_token
===================================================================
--- trunk/contrib/openbsm/test/reference/file_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/file_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/file_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/header32_token
===================================================================
--- trunk/contrib/openbsm/test/reference/header32_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/header32_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/header32_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/in_addr_record
===================================================================
--- trunk/contrib/openbsm/test/reference/in_addr_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/in_addr_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/in_addr_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/in_addr_token
===================================================================
--- trunk/contrib/openbsm/test/reference/in_addr_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/in_addr_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/in_addr_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/ip_record
===================================================================
--- trunk/contrib/openbsm/test/reference/ip_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/ip_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/ip_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/ip_token
===================================================================
--- trunk/contrib/openbsm/test/reference/ip_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/ip_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/ip_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/ipc_record
===================================================================
--- trunk/contrib/openbsm/test/reference/ipc_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/ipc_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/ipc_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/ipc_token
===================================================================
--- trunk/contrib/openbsm/test/reference/ipc_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/ipc_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/ipc_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/iport_record
===================================================================
--- trunk/contrib/openbsm/test/reference/iport_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/iport_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/iport_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/iport_token
===================================================================
--- trunk/contrib/openbsm/test/reference/iport_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/iport_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/iport_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/opaque_record
===================================================================
--- trunk/contrib/openbsm/test/reference/opaque_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/opaque_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/opaque_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/opaque_token
===================================================================
--- trunk/contrib/openbsm/test/reference/opaque_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/opaque_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/opaque_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/path_record
===================================================================
--- trunk/contrib/openbsm/test/reference/path_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/path_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/path_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/path_token
===================================================================
--- trunk/contrib/openbsm/test/reference/path_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/path_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/path_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process32_record
===================================================================
--- trunk/contrib/openbsm/test/reference/process32_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process32_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process32_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process32_token
===================================================================
--- trunk/contrib/openbsm/test/reference/process32_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process32_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process32_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process32ex_record-IPv4
===================================================================
--- trunk/contrib/openbsm/test/reference/process32ex_record-IPv4	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process32ex_record-IPv4	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process32ex_record-IPv4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process32ex_record-IPv6
===================================================================
--- trunk/contrib/openbsm/test/reference/process32ex_record-IPv6	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process32ex_record-IPv6	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process32ex_record-IPv6
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process32ex_token-IPv4
===================================================================
--- trunk/contrib/openbsm/test/reference/process32ex_token-IPv4	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process32ex_token-IPv4	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process32ex_token-IPv4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process32ex_token-IPv6
===================================================================
--- trunk/contrib/openbsm/test/reference/process32ex_token-IPv6	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process32ex_token-IPv6	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process32ex_token-IPv6
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process64_record
===================================================================
--- trunk/contrib/openbsm/test/reference/process64_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process64_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process64_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process64_token
===================================================================
--- trunk/contrib/openbsm/test/reference/process64_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process64_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process64_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process64ex_record-IPv4
===================================================================
--- trunk/contrib/openbsm/test/reference/process64ex_record-IPv4	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process64ex_record-IPv4	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process64ex_record-IPv4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process64ex_record-IPv6
===================================================================
--- trunk/contrib/openbsm/test/reference/process64ex_record-IPv6	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process64ex_record-IPv6	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process64ex_record-IPv6
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process64ex_token-IPv4
===================================================================
--- trunk/contrib/openbsm/test/reference/process64ex_token-IPv4	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process64ex_token-IPv4	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process64ex_token-IPv4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/process64ex_token-IPv6
===================================================================
--- trunk/contrib/openbsm/test/reference/process64ex_token-IPv6	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/process64ex_token-IPv6	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/process64ex_token-IPv6
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/return32_record
===================================================================
--- trunk/contrib/openbsm/test/reference/return32_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/return32_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/return32_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/return32_token
===================================================================
--- trunk/contrib/openbsm/test/reference/return32_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/return32_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/return32_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/seq_record
===================================================================
--- trunk/contrib/openbsm/test/reference/seq_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/seq_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/seq_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/seq_token
===================================================================
--- trunk/contrib/openbsm/test/reference/seq_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/seq_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/seq_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/subject32_record
===================================================================
--- trunk/contrib/openbsm/test/reference/subject32_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/subject32_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/subject32_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/subject32_token
===================================================================
--- trunk/contrib/openbsm/test/reference/subject32_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/subject32_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/subject32_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/subject32ex_record
===================================================================
--- trunk/contrib/openbsm/test/reference/subject32ex_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/subject32ex_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/subject32ex_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/subject32ex_token-IPv4
===================================================================
--- trunk/contrib/openbsm/test/reference/subject32ex_token-IPv4	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/subject32ex_token-IPv4	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/subject32ex_token-IPv4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/subject32ex_token-IPv6
===================================================================
--- trunk/contrib/openbsm/test/reference/subject32ex_token-IPv6	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/subject32ex_token-IPv6	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/subject32ex_token-IPv6
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/text_record
===================================================================
--- trunk/contrib/openbsm/test/reference/text_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/text_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/text_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/text_token
===================================================================
--- trunk/contrib/openbsm/test/reference/text_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/text_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/text_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/trailer_token
===================================================================
--- trunk/contrib/openbsm/test/reference/trailer_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/trailer_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/trailer_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/zonename_record
===================================================================
--- trunk/contrib/openbsm/test/reference/zonename_record	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/zonename_record	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/zonename_record
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/contrib/openbsm/test/reference/zonename_token
===================================================================
--- trunk/contrib/openbsm/test/reference/zonename_token	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/test/reference/zonename_token	2018-06-27 22:43:21 UTC (rev 11165)

Property changes on: trunk/contrib/openbsm/test/reference/zonename_token
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/contrib/openbsm/tools/Makefile.am
===================================================================
--- trunk/contrib/openbsm/tools/Makefile.am	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/tools/Makefile.am	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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

Modified: trunk/contrib/openbsm/tools/audump.c
===================================================================
--- trunk/contrib/openbsm/tools/audump.c	2018-06-27 22:39:39 UTC (rev 11164)
+++ trunk/contrib/openbsm/tools/audump.c	2018-06-27 22:43:21 UTC (rev 11165)
@@ -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>



More information about the Midnightbsd-cvs mailing list