Merge OpenBSM 1.1 from OpenBSM vendor branch to head.

OpenBSM history for imported revision below for reference.

MFC after:      2 weeks
Sponsored by:   Apple, Inc.
Obtained from:  TrustedBSD Project

OpenBSM 1.1

- Change auditon(2) parameters and data structures to be 32/64-bit architecture
  independent.  Add more information to man page about auditon(2) parameters.
- Add wrapper functions for auditon(2) to use legacy commands when the new
  commands are not supported.
- Add default for 'expire-after' in audit_control to expire trail files when
  the audit directory is more than 10 megabytes ('10M').
- Interface to convert between local and BSM fcntl(2) command values has been
  added:  au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with
  definitions of constants in audit_fcntl.h.
- A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens
  generated by audit_submit(3) were improperly encoded has been fixed.
- Fix example in audit_submit(3) man page.  Also, make it clear that we want
  the audit ID as the argument.
- A new audit event class 'aa', for post-login authentication and
  authorization events, has been added.

1 files changed, 7 insertions, 8 deletions

diff --git a/contrib/openbsm/INSTALL b/contrib/openbsm/INSTALL
index c2eac44..212f0f5 100644
--- a/contrib/openbsm/INSTALL
+++ b/contrib/openbsm/INSTALL
@@ -2,9 +2,8 @@ OpenBSM Build and Installation Instructions
 
 OpenBSM is currently built using autoconf and automake, which should allow
 for building on a range of operating systems, including FreeBSD, Mac OS X,
-and Linux.  Depending on the availability of audit facilities in the
-underlying operating system, some components that depend on kernel audit
-support are built conditionally.  Typically, build will be performed using:
+and Linux.  Some components are built only if appropriate kernel audit
+suppport is found.  Typical builds will be performed using:
 
     ./configure
     make
@@ -15,10 +14,14 @@ force the compile to fail if a warning is found:
 
     CFLAGS="-Wall -Werror" ./configure
 
-To install, use:
+To install the library, binaries, and man pages, use:
 
     make install
 
+The OpenBSM install will not install files in /etc; these have to be
+manually installed or merged.  Currently, the locations of these files are
+not configurable.
+
 You may wish to specify that the OpenBSM components not be installed in the
 base system, rather in a specific directory.  This may be done using the
 --prefix argument to configure.  If installing to a specific directory,
@@ -29,7 +32,3 @@ directory the correct libbsm is used:
     make
     make install
     LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH
-
-You will need to manually propagate openbsm/etc/* into /etc/security on your
-system; this is not done automatically so as to avoid disrupting the current
-configuration.  Currently, the locations of these files is not configurable.