Merge OpenBSM 1.2-alpha2 from vendor branch to FreeBSD 10-CURRENT; the

primary new feature is auditdistd.

Obtained from:	TrustedBSD Project
Sponsored by:	The FreeBSD Foundation (auditdistd)

7 files changed, 294 insertions, 219 deletions

diff --git a/contrib/openbsm/man/Makefile.am b/contrib/openbsm/man/Makefile.am
index e65a68c..ad1802e 100644
--- a/contrib/openbsm/man/Makefile.am
+++ b/contrib/openbsm/man/Makefile.am
@@ -1,6 +1,6 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.am#1 $
-#
+##
+## $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.am#2 $
+##
 
 man2_MANS =			\
 	audit.2			\
diff --git a/contrib/openbsm/man/Makefile.in b/contrib/openbsm/man/Makefile.in
index aeb775a..56772f2 100644
--- a/contrib/openbsm/man/Makefile.in
+++ b/contrib/openbsm/man/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,14 +13,28 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-#
-# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#9 $
-#
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,8 +58,41 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man2dir = $(mandir)/man2
 am__installdirs = "$(DESTDIR)$(man2dir)" "$(DESTDIR)$(man5dir)"
 man5dir = $(mandir)/man5
@@ -64,45 +111,52 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MIG = @MIG@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -111,13 +165,15 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -187,14 +243,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  man/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  man/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -212,110 +268,118 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man2: $(man2_MANS) $(man_MANS)
+install-man2: $(man2_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man2dir)" || $(MKDIR_P) "$(DESTDIR)$(man2dir)"
-	@list='$(man2_MANS) $(dist_man2_MANS) $(nodist_man2_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.2*) list="$$list $$i" ;; \
-	  esac; \
+	@list1='$(man2_MANS)'; \
+	list2=''; \
+	test -n "$(man2dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man2dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man2dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.2[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^2][0-9a-z]*$$,2,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man2dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man2dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    2*) ;; \
-	    *) ext='2' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man2dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man2dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man2dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man2dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man2:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man2_MANS) $(dist_man2_MANS) $(nodist_man2_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.2*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    2*) ;; \
-	    *) ext='2' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man2dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man2dir)/$$inst"; \
-	done
-install-man5: $(man5_MANS) $(man_MANS)
+	@list='$(man2_MANS)'; test -n "$(man2dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^2][0-9a-z]*$$,2,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man2dir)'; $(am__uninstall_files_from_dir)
+install-man5: $(man5_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.5*) list="$$list $$i" ;; \
-	  esac; \
+	@list1='$(man5_MANS)'; \
+	list2=''; \
+	test -n "$(man5dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.5[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    5*) ;; \
-	    *) ext='5' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man5:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.5*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    5*) ;; \
-	    *) ext='5' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-	done
+	@list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -331,13 +395,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -358,16 +426,22 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -386,6 +460,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -394,18 +470,28 @@ install-data-am: install-man
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man: install-man2 install-man5
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -447,6 +533,7 @@ uninstall-man: uninstall-man2 uninstall-man5
 # How to do MLINKS in automake?
 # MLINKS= getaudit.2 getaudit_addr.2					\
 # 	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:
diff --git a/contrib/openbsm/man/audit.log.5 b/contrib/openbsm/man/audit.log.5
index 143936c..fd52896 100644
--- a/contrib/openbsm/man/audit.log.5
+++ b/contrib/openbsm/man/audit.log.5
@@ -24,7 +24,7 @@
 .\" 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#23 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#26 $
 .\"
 .Dd November 5, 2006
 .Dt AUDIT.LOG 5
@@ -83,7 +83,7 @@ token can be created using
 .It "Token ID	1 byte	Token ID"
 .It "Seconds	4 bytes	File time stamp"
 .It "Microseconds	4 bytes	File time stamp"
-.It "File name lengh	2 bytes	File name of audit trail"
+.It "File name length	2 bytes	File name of audit trail"
 .It "File pathname	N bytes + 1 NUL	File name of audit trail"
 .El
 .Ss Header Token
@@ -157,7 +157,7 @@ The
 .Dq arbitrary data
 token contains a byte stream of opaque (untyped) data.
 The size of the data is calculated as the size of each unit of data
-multipled by the number of units of data.
+multiplied by the number of units of data.
 A
 .Dq How to print
 field is present to specify how to print the data, but interpretation of
@@ -183,7 +183,6 @@ An
 token can be created using
 .Xr au_to_in_addr 3
 for an IPv4 address.
-.Pp
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
 .It Sy "Field	Bytes	Description"
 .It "Token ID	1 byte	Token ID"
@@ -486,13 +485,13 @@ A System V IPC permission token may be created using
 .It Li "Creator user ID" Ta "4 bytes" Ta "User ID of IPC creator"
 .It Li "Creator group ID" Ta "4 bytes" Ta "Group ID of IPC creator"
 .It Li "Access mode" Ta "4 bytes" Ta "Access mode"
-.It Li "Sequnce number" Ta "4 bytes" Ta "Sequnce number"
+.It Li "Sequence number" Ta "4 bytes" Ta "Sequence number"
 .It Li "Key" Ta "4 bytes" Ta "IPC key"
 .El
 .Ss Arg Token
 The
 .Dq arg
-token contains informations about arguments of the system call.
+token contains information about arguments of the system call.
 Depending on the size of the desired argument value, an Arg token may be
 created using
 .Xr au_to_arg32 3
@@ -509,7 +508,7 @@ or
 .Ss exec_args Token
 The
 .Dq exec_args
-token contains informations about arguements of the exec() system call.
+token contains information about arguments of the exec() system call.
 An exec_args token may be created using
 .Xr au_to_exec_args 3 .
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
@@ -521,7 +520,7 @@ An exec_args token may be created using
 .Ss exec_env Token
 The
 .Dq exec_env
-token contains current eviroment variables to an exec() system call.
+token contains current environment variables to an exec() system call.
 An exec_args token may be created using
 .Xr au_to_exec_env 3 .
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
@@ -551,7 +550,7 @@ token contains information about UNIX domain and Internet sockets.
 Each token has four or eight fields.
 Depending on the type of socket, a socket token may be created using
 .Xr au_to_sock_unix 3 ,
-.Xr au_to_sock_inet32 3 
+.Xr au_to_sock_inet32 3
 or
 .Xr au_to_sock_inet128 3 .
 .Bl -column -offset 3n ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description"
@@ -598,7 +597,6 @@ token ...
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
 .It Sy "Field	Bytes	Description"
 .It "Token ID	1 byte	Token ID"
-.It XXXXX
 .El
 .Ss Use-of-auth Token
 The
@@ -607,7 +605,6 @@ token ...
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
 .It Sy "Field	Bytes	Description"
 .It "Token ID	1 byte	Token ID"
-.It XXXXX
 .El
 .Ss Command Token
 The
@@ -616,7 +613,6 @@ token ...
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
 .It Sy "Field	Bytes	Description"
 .It "Token ID	1 byte	Token ID"
-.It XXXXX
 .El
 .Ss ACL Token
 The
@@ -625,7 +621,6 @@ token ...
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
 .It Sy "Field	Bytes	Description"
 .It "Token ID	1 byte	Token ID"
-.It XXXXX
 .El
 .Ss Zonename Token
 The
@@ -633,10 +628,9 @@ The
 token holds a NUL-terminated string with the name of the zone or jail from
 which the record originated.
 A
-.Dz zonename
+.Dq zonename
 token can be created using
 .Xr au_to_zonename 3 .
-.Pp
 .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL"
 .It Sy "Field	Bytes	Description"
 .It "Token ID	1 byte	Token ID"
diff --git a/contrib/openbsm/man/audit_control.5 b/contrib/openbsm/man/audit_control.5
index 801a66e..69ff80c 100644
--- a/contrib/openbsm/man/audit_control.5
+++ b/contrib/openbsm/man/audit_control.5
@@ -26,7 +26,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#23 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#26 $
 .\"
 .Dd May 14, 2009
 .Dt AUDIT_CONTROL 5
@@ -52,6 +52,18 @@ audit system.
 See
 .Xr audit 8
 for a description of how to restart the audit system.
+.It Va dist
+When set to
+.Va on
+or
+.Va yes ,
+.Xr auditd 8
+will be creating hardlinks to all trail files in
+.Pa /var/audit/dist
+directory.
+Those hardlinks will be consumed by the
+.Xr auditdistd 8
+daemon.
 .It Va flags
 Specifies which audit event classes are audited for all users.
 .Xr audit_user 5
@@ -92,7 +104,7 @@ For example, 2M is the same as 2097152.
 .It Va expire-after
 Specifies when audit log files will expire and be removed.
 This may be after a time period has passed since the file was last
-written to or when the aggregate of all the trail files have reached a 
+written to or when the aggregate of all the trail files have reached a
 specified size or a combination of both.
 If no expire-after parameter is given then audit log files will not
 expire and be removed by the audit control system.
@@ -208,13 +220,13 @@ Disk space used in Bytes.
 .It Li K
 Disk space used in Kilobytes.
 .It Li M
-Disk space used in Megabytes. 
+Disk space used in Megabytes.
 .It Li G
-Disk space used in Gigabytes. 
+Disk space used in Gigabytes.
 .El
 .Pp
-The suffixes on the values are case sensitive.  
-If both an age and disk space value are used they are seperated by
+The suffixes on the values are case sensitive.
+If both an age and disk space value are used they are separated by
 AND or OR and both values are used to determine when audit
 log files expire.
 In the case of AND, both the age and disk space conditions must be met
@@ -222,7 +234,7 @@ before the log file is removed.
 In the case of OR, either condition may expire the log file.
 For example:
 .Bd -literal -offset indent
-expire-after: 60d AND 1G 
+expire-after: 60d AND 1G
 .Ed
 .Pp
 will expire files that are older than 60 days but only if 1
diff --git a/contrib/openbsm/man/auditon.2 b/contrib/openbsm/man/auditon.2
index e43debb..8b880b7 100644
--- a/contrib/openbsm/man/auditon.2
+++ b/contrib/openbsm/man/auditon.2
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#16 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#18 $
 .\"
 .Dd January 29, 2009
 .Dt AUDITON 2
@@ -73,25 +73,25 @@ and
 .Dv AUDIT_ARGE .
 If
 .Dv AUDIT_CNT is set, the system will continue even if it becomes low
-on space and discontinue logging events until the low space condition is 
+on space and discontinue logging events until the low space condition is
 remedied.
-If it is not set, audited events will block until the low space 
+If it is not set, audited events will block until the low space
 condition is remedied.
 Unaudited events, however, are unaffected.
-If 
-.Dv AUDIT_AHLT is set, a 
+If
+.Dv AUDIT_AHLT is set, a
 .Xr panic 9
 if it cannot write an event to the global audit log file.
-If 
+If
 .Dv AUDIT_ARGV
-is set, then the argument list passed to the 
-.Xr execve 2 
+is set, then the argument list passed to the
+.Xr execve 2
 system call will be audited.  If
 .Dv AUDIT_ARGE
 is set, then the environment variables passed to the
 .Xr execve 2
 system call will be audited.  The default policy is none of the audit policy
-control flags set. 
+control flags set.
 .It Dv A_SETKAUDIT
 Set the host information.
 The
@@ -102,7 +102,7 @@ must point to a
 structure containing the host IP address information.
 After setting, audit records
 that are created as a result of kernel events will contain
-this information. 
+this information.
 .It Dv A_SETKMASK
 Set the kernel preselection masks (success and failure).
 The
@@ -110,9 +110,9 @@ The
 argument
 must point to a
 .Vt au_mask_t
-structure containing the mask values as defined in 
+structure containing the mask values as defined in
 .In bsm/audit.h .
-These masks are used for non-attributable audit event preselection. 
+These masks are used for non-attributable audit event preselection.
 The field
 .Fa am_success
 specifies which classes of successful audit events are to be logged to the
@@ -197,14 +197,14 @@ audit condition, one of
 .Dv AUC_NOAUDIT ,
 or
 .Dv AUC_DISABLED .
-If 
-.Dv AUC_NOAUDIT 
-is set, then auditing is temporarily suspended. If 
+If
+.Dv AUC_NOAUDIT
+is set, then auditing is temporarily suspended. If
 .Dv AUC_AUDITING
-is set, auditing is resumed. If 
-.Dv AUC_DISABLED 
+is set, auditing is resumed. If
+.Dv AUC_DISABLED
 is set, the auditing system will
-shutdown, draining all audit records and closing out the audit trail file. 
+shutdown, draining all audit records and closing out the audit trail file.
 .It Dv A_SETCLASS
 Set the event class preselection mask for an audit event.
 The
@@ -215,7 +215,7 @@ must point to a
 structure containing the audit event and mask.
 The field
 .Fa ec_number
-is the audit event and 
+is the audit event and
 .Fa ec_class
 is the audit class mask. See
 .Xr audit_event 5
@@ -237,7 +237,7 @@ The field
 must point to a
 .Fa au_mask_t
 structure which holds the preselection masks as described in the
-.Da A_SETKMASK
+.Dv A_SETKMASK
 section above.
 .It Dv A_SETFSIZE
 Set the maximum size of the audit log file.
@@ -259,7 +259,7 @@ argument
 must point to a
 .Vt au_evclass_map_t
 structure. See the
-.Dv A_SETCLASS 
+.Dv A_SETCLASS
 section above for more information.
 .It Dv A_GETKAUDIT
 Get the current host information.
@@ -277,23 +277,23 @@ argument
 must point to a
 .Vt auditpinfo_t
 structure which will be set to contain
-.Fa ap_auid 
-(the audit ID), 
+.Fa ap_auid
+(the audit ID),
 .Fa ap_mask
 (the preselection mask),
 .Fa ap_termid
 (the terminal ID), and
-.Fa ap_asid 
+.Fa ap_asid
 (the audit session ID)
 of the given target process.
-The process ID of the target process is passed 
+The process ID of the target process is passed
 into the kernel using the
 .Fa ap_pid
 field.
 See the section
 .Dv A_SETPMASK
-above and 
-.Xr getaudit 2 
+above and
+.Xr getaudit 2
 for more information.
 .It Dv A_GETPINFO_ADDR
 Return the extended audit settings for a process.
@@ -302,20 +302,20 @@ The
 argument
 must point to a
 .Vt auditpinfo_addr_t
-structure which is similar to the 
+structure which is similar to the
 .Vt auditpinfo_addr_t
-structure described above. 
-The exception is the 
+structure described above.
+The exception is the
 .Fa ap_termid
 (the terminal ID) field which points to a
-.Vt au_tid_addr_t 
-structure can hold much a larger terminal address and an address type. 
+.Vt au_tid_addr_t
+structure can hold much a larger terminal address and an address type.
 The process ID of the target process is passed into the kernel using the
 .Fa ap_pid
 field.
-See the section 
+See the section
 .Dv A_SETPMASK
-above and 
+above and
 .Xr getaudit 2
 for more information.
 .It Dv A_GETSINFO_ADDR
@@ -326,10 +326,10 @@ argument
 must point to a
 .Vt auditinfo_addr_t
 structure.
-The audit session ID of the target session is passed 
+The audit session ID of the target session is passed
 into the kernel using the
 .Fa ai_asid
-field.  See 
+field.  See
 .Xr getaudit_addr 2
 for more information about the
 .Vt auditinfo_addr_t
@@ -353,8 +353,8 @@ must point to a
 value which will be set to
 one of the current audit policy flags.
 The audit policy flags are
-described in the 
-.Dv A_SETPOLICY 
+described in the
+.Dv A_SETPOLICY
 section above.
 .It Dv A_GETQCTRL
 Return the current kernel audit queue control parameters.
@@ -411,12 +411,12 @@ argument
 must point to a
 .Vt int
 value which will be set to
-the current audit condition, one of 
+the current audit condition, one of
 .Dv AUC_AUDITING ,
-.Dv AUC_NOAUDIT 
+.Dv AUC_NOAUDIT
 or
 .Dv AUC_DISABLED .
-See the 
+See the
 .Dv A_SETCOND
 section above for more information.
 .It Dv A_SENDTRIGGER
diff --git a/contrib/openbsm/man/getaudit.2 b/contrib/openbsm/man/getaudit.2
index 77a0f8e..5935273 100644
--- a/contrib/openbsm/man/getaudit.2
+++ b/contrib/openbsm/man/getaudit.2
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#10 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#11 $
 .\"
 .Dd October 19, 2008
 .Dt GETAUDIT 2
@@ -156,7 +156,7 @@ The
 .Fa length
 argument indicates an overflow condition will occur.
 .It Bq Er E2BIG
-The address is too big and, therefore, 
+The address is too big and, therefore,
 .Fn getaudit_addr
 should be used instead.
 .El
diff --git a/contrib/openbsm/man/setaudit.2 b/contrib/openbsm/man/setaudit.2
index 5426c87..41448d6 100644
--- a/contrib/openbsm/man/setaudit.2
+++ b/contrib/openbsm/man/setaudit.2
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#10 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#12 $
 .\"
 .Dd April 19, 2005
 .Dt SETAUDIT 2
@@ -58,9 +58,7 @@ and
 The
 .Fa auditinfo_t
 data structure is defined as follows:
-.nf
-.in +4n
-
+.Bd -literal -offset 4n
 struct auditinfo {
 	au_id_t        ai_auid;         /* Audit user ID */
 	au_mask_t      ai_mask;         /* Audit masks */
@@ -68,62 +66,50 @@ struct auditinfo {
 	au_asid_t      ai_asid;         /* Audit session ID */
 };
 typedef struct auditinfo        auditinfo_t;
-.in
-.fi
+.Ed
 .Pp
 The
 .Fa ai_auid
-variable contains the audit identifier which is recorded in the audit log for 
+variable contains the audit identifier which is recorded in the audit log for
 each event the process caused.
-.PP
-
+.Pp
 The
 .Fa au_mask_t
-data structure defines the bit mask for auditing successful and failed events 
+data structure defines the bit mask for auditing successful and failed events
 out of the predefined list of event classes. It is defined as follows:
-.nf
-.in +4n
-
+.Bd -literal -offset 4n
 struct au_mask {
 	unsigned int    am_success;     /* success bits */
 	unsigned int    am_failure;     /* failure bits */
 };
 typedef struct au_mask  au_mask_t;
-.in
-.fi
-.PP
-
+.Ed
+.Pp
 The
 .Fa au_termid_t
-data structure defines the Terminal ID recorded with every event caused by the 
+data structure defines the Terminal ID recorded with every event caused by the
 process. It is defined as follows:
-.nf
-.in +4n
-
+.Bd -literal -offset 4n
 struct au_tid {
 	dev_t           port;
 	u_int32_t       machine;
 };
 typedef struct au_tid   au_tid_t;
-
-.in
-.fi
-.PP
+.Ed
+.Pp
 The
 .Fa ai_asid
-variable contains the audit session ID which is recorded with every event 
+variable contains the audit session ID which is recorded with every event
 caused by the process.
 .Pp
 The
 .Fn setaudit_addr
 system call
 uses the expanded
-.Fa auditinfo_addr_t 
+.Fa auditinfo_addr_t
 data structure supports Terminal IDs with larger addresses such as those used
 in IP version 6.  It is defined as follows:
-.nf
-.in +4n
-
+.Bd -literal -offset 4n
 struct auditinfo_addr {
 	au_id_t         ai_auid;        /* Audit user ID. */
 	au_mask_t       ai_mask;        /* Audit masks. */
@@ -131,24 +117,20 @@ struct auditinfo_addr {
 	au_asid_t       ai_asid;        /* Audit session ID. */
 };
 typedef struct auditinfo_addr   auditinfo_addr_t;
-.in
-.fi
+.Ed
 .Pp
-The 
+The
 .Fa au_tid_addr_t
-data structure which includes a larger address storage field and an additional 
+data structure which includes a larger address storage field and an additional
 field with the type of address stored:
-.nf
-.in +4n
-
+.Bd -literal -offset 4n
 struct au_tid_addr {
 	dev_t           at_port;
 	u_int32_t       at_type;
 	u_int32_t       at_addr[4];
 };
 typedef struct au_tid_addr      au_tid_addr_t;
-.in
-.fi
+.Ed
 .Pp
 These system calls require an appropriate privilege to complete.
 .Sh RETURN VALUES