Vendor branch import of OpenBSM 1.0 alpha 3:

- Man page formatting, cross reference, mlinks, and accuracy improvements.
- auditd and tools now compile and run on FreeBSD/arm.
- auditd will now fchown() the trail file to the audit review group, if
  defined at compile-time.
- Added AUE_SYSARCH for FreeBSD.
- Definition of AUE_SETFSGID fixed for Linux.

Many thanks to:	brueffer, cognet
Obtained from:	TrustedBSD Project

8 files changed, 51 insertions, 46 deletions

diff --git a/contrib/openbsm/libbsm/Makefile b/contrib/openbsm/libbsm/Makefile
index 4137f4a..00534aa 100644
--- a/contrib/openbsm/libbsm/Makefile
+++ b/contrib/openbsm/libbsm/Makefile
@@ -1,7 +1,7 @@
 #
 # OpenBSM libbsm
 #
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#11 $
+# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#13 $
 #
 
 LIB=		bsm
@@ -35,7 +35,9 @@ MAN=	libbsm.3							\
 
 MLINKS=	libbsm.3 bsm.3							\
 	au_class.3 getauclassent.3					\
+	au_class.3 getauclassent_r.3					\
 	au_class.3 getauclassnam.3					\
+	au_class.3 getauclassnam_r.3					\
 	au_class.3 setauclass.3						\
 	au_class.3 endauclass.3						\
 	au_control.3 setac.3						\
@@ -47,9 +49,13 @@ MLINKS=	libbsm.3 bsm.3							\
 	au_event.3 setauevent.3						\
 	au_event.3 endauevent.3						\
 	au_event.3 getauevent.3						\
+	au_event.3 getauevent_r.3					\
 	au_event.3 getauevnam.3						\
+	au_event.3 getauevnam_r.3					\
 	au_event.3 getauevnum.3						\
+	au_event.3 getauevnum_r.3					\
 	au_event.3 getauevnonam.3					\
+	au_event.3 getauevnonam_r.3					\
 	au_io.3	au_fetch_tok.3						\
 	au_io.3	au_print_tok.3						\
 	au_io.3	au_read_rec.3						\
diff --git a/contrib/openbsm/libbsm/au_control.3 b/contrib/openbsm/libbsm/au_control.3
index 915c521..0cd66f1 100644
--- a/contrib/openbsm/libbsm/au_control.3
+++ b/contrib/openbsm/libbsm/au_control.3
@@ -23,7 +23,7 @@
 .\" 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#2 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#3 $
 .\"
 .Dd April 19, 2005
 .Dt AU_CONTROL 3
@@ -67,7 +67,7 @@ closes the
 database.
 .Pp
 .Fn getacdir
-Return the name of the directory where log data is stored via the passed
+returns the name of the directory where log data is stored via the passed
 character buffer
 .Va name
 of length
diff --git a/contrib/openbsm/libbsm/au_event.3 b/contrib/openbsm/libbsm/au_event.3
index bd021de..dfaea02 100644
--- a/contrib/openbsm/libbsm/au_event.3
+++ b/contrib/openbsm/libbsm/au_event.3
@@ -23,7 +23,7 @@
 .\" 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#3 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#4 $
 .\"
 .Dd April 19, 2005
 .Dt AU_EVENT 3
@@ -123,9 +123,9 @@ Functions
 and
 .Fn getauevnuam
 will return a reference to a
-.Dt struct au_event_ent
+.Ft struct au_event_ent
 or
-.Dt au_event_t
+.Ft au_event_t
 on success, or
 .Dv NULL on failure, with
 .Va errno
diff --git a/contrib/openbsm/libbsm/au_free_token.3 b/contrib/openbsm/libbsm/au_free_token.3
index fc4ab0b..84fa443 100644
--- a/contrib/openbsm/libbsm/au_free_token.3
+++ b/contrib/openbsm/libbsm/au_free_token.3
@@ -27,7 +27,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/libbsm/au_free_token.3#2 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#3 $
 .\"
 .Dd April 19, 2005
 .Dt AU_FREE_TOKEN 3
@@ -40,7 +40,7 @@
 .Sh SYNOPSIS
 .In libbsm.h
 .Ft void
-.Fn au_free_tokenen "token_t *tok"
+.Fn au_free_token "token_t *tok"
 .Sh DESCRIPTION
 The BSM API generally manages deallocation of
 .Vt token_t
diff --git a/contrib/openbsm/libbsm/au_mask.3 b/contrib/openbsm/libbsm/au_mask.3
index 67bb187..6698ae5 100644
--- a/contrib/openbsm/libbsm/au_mask.3
+++ b/contrib/openbsm/libbsm/au_mask.3
@@ -23,7 +23,7 @@
 .\" 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#2 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#3 $
 .\"
 .Dd April 19, 2005
 .Dt AU_MASK 3
@@ -109,7 +109,7 @@ will be set to indicate the error.
 .Sh IMPLEMENTATION NOTES
 .Fn au_preselect
 makes implicit use of various audit database routines, and may influence
-the behavior of simultaenous or interleaved processing of those databases by
+the behavior of simultaneous or interleaved processing of those databases by
 other code.
 .Sh SEE ALSO
 .Xr libbsm 3 ,
diff --git a/contrib/openbsm/libbsm/au_token.3 b/contrib/openbsm/libbsm/au_token.3
index dd0ce27..cdf871b 100644
--- a/contrib/openbsm/libbsm/au_token.3
+++ b/contrib/openbsm/libbsm/au_token.3
@@ -23,7 +23,7 @@
 .\" 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#4 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#5 $
 .\"
 .Dd April 19, 2005
 .Dt AU_TOKEN 3
@@ -179,10 +179,10 @@
 .Fn au_to_trailer "int rec_size"
 .Sh DESCRIPTION
 These interfaces support the allocation of BSM audit tokens, represented by
-.Dt token_t ,
+.Ft token_t ,
 for various data types.
 .Sh RETURN VALUES
-On sucess, a pointer to a
+On success, a pointer to a
 .Vt token_t
 will be returned; the allocated
 .Vt token_t
diff --git a/contrib/openbsm/libbsm/au_user.3 b/contrib/openbsm/libbsm/au_user.3
index e71deae..c0fab6f 100644
--- a/contrib/openbsm/libbsm/au_user.3
+++ b/contrib/openbsm/libbsm/au_user.3
@@ -23,7 +23,7 @@
 .\" 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#3 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#4 $
 .\"
 .Dd April 19, 2005
 .Dt AU_USER 3
@@ -72,7 +72,7 @@ and events never to audit
 .Dv au_never .
 .Pp
 .Fn getauuserent
-return the next user found in the
+returns the next user found in the
 .Xr audit_user 5
 database, or the first if the function has not yet been called.
 .Dv NULL
@@ -96,7 +96,7 @@ closes the
 database, if open.
 .Pp
 .Nm au_user_mask
-calculate a new session audit mask to be returned via
+calculates a new session audit mask to be returned via
 .Dv mask_p
 for the user identified by
 .Dv username .
diff --git a/contrib/openbsm/libbsm/libbsm.3 b/contrib/openbsm/libbsm/libbsm.3
index 3ec8168..c2ea877 100644
--- a/contrib/openbsm/libbsm/libbsm.3
+++ b/contrib/openbsm/libbsm/libbsm.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#3 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#4 $
 .\"
 .Dd April 19, 2005
 .Dt LIBBSM 3
@@ -48,57 +48,56 @@ event stream interfaces, class interfaces, control interfaces, event
 interfaces, I/O interfaces, mask interfaces, notification interfaces, token
 interfaces, and user interfaces.
 These are described respectively in the
-.Xr au_stream 3 ,
 .Xr au_class 3 ,
 .Xr au_control 3 ,
 .Xr au_event 3 ,
 .Xr au_mask 3 ,
 .Xr au_notify 3 ,
+.Xr au_stream 3 ,
 .Xr au_token 3 ,
 .Xr au_user 3
 man pages.
 .Ss Audit Event Stream Interfaces
 Audit event stream interfaces support interaction with file-backed audit
 event streams:
-.Xr au_free_token 3 ,
+.Xr au_close 3 .
 .Xr au_free_token 3 ,
 .Xr au_open 3 ,
 .Xr au_write 3 ,
-.Xr au_close 3 .
 .Ss Audit Class Interfaces
 Audit class interfaces support the look up of information from the
 .Xr audit_class 5
 database:
+.Xr endauclass 3 ,
 .Xr getauclassent 3 ,
 .Xr getauclassent_r 3 ,
 .Xr getauclassnam 3 ,
 .Xr getauclassnam_r 3 ,
-.Xr setauclass 3 ,
-.Xr endauclass 3 .
+.Xr setauclass 3 .
 .Ss Audit Control Interfaces
 Audit control interfaces support the look up of information from the
 .Xr audit_control 5
 database:
-.Xr setac 3 ,
 .Xr endac 3 ,
+.Xr setac 3 ,
 .Xr getacdir 3 ,
-.Xr getacmin 3 ,
 .Xr getacflg 3 ,
+.Xr getacmin 3 ,
 .Xr getacna 3 .
 .Ss Audit Event Interfaces
 Audit event interfaces support the look up of information from the
 .Xr audit_event 5
 database:
-.Xr setauevent 3 ,
 .Xr endauevent 3 ,
+.Xr setauevent 3 ,
 .Xr getauevent 3 ,
 .Xr getauevent_r 3 ,
 .Xr getauevnam 3 ,
 .Xr getauevnam_r 3 ,
-.Xr getauevnum 3 ,
-.Xr getauevnum_r 3 ,
 .Xr getauevnonam 3 ,
 .Xr getauevnonam_r 3 ,
+.Xr getauevnum 3 ,
+.Xr getauevnum_r 3 .
 .Ss Audit I/O Interfaces
 Audit I/O interfaces support the processing and printing of tokens, as well
 as the reading of audit records:
@@ -117,9 +116,9 @@ by a mask:
 .Ss Audit Notification Interfaces
 Audit notification routines track audit state in a form permitting efficient
 update, avoiding frequent system calls to check the kernel audit state:
+.Xr au_get_state 3 ,
 .Xr au_notify_initialize 3 ,
-.Xr au_notify_terminate 3 ,
-.Xr au_get_state 3 .
+.Xr au_notify_terminate 3 .
 These interfaces are implemented only for Darwin/Mac OS X.
 .Ss Audit Token Interface
 Audit token interfaces permit the creation of tokens for use in creating
@@ -127,63 +126,63 @@ audit records for submission to event streams.
 Each interface converts a C type to its
 .Vt token_t
 representation.
+.Xr au_to_arg 3 ,
 .Xr au_to_arg32 3 ,
 .Xr au_to_arg64 3 ,
-.Xr au_to_arg 3 ,
 .Xr au_to_attr64 3 ,
 .Xr au_to_data 3 ,
+.Xr au_to_exec_args 3 ,
+.Xr au_to_exec_env 3 ,
 .Xr au_to_exit 3 ,
+.Xr au_to_file 3 ,
 .Xr au_to_groups 3 ,
-.Xr au_to_newgroups 3 ,
+.Xr au_to_header32 3 ,
+.Xr au_to_header64 3 ,
 .Xr au_to_in_addr 3 ,
 .Xr au_to_in_addr_ex 3 ,
 .Xr au_to_ip 3 ,
 .Xr au_to_ipc 3 ,
 .Xr au_to_ipc_perm 3 ,
 .Xr au_to_iport 3 ,
+.Xr au_to_me 3 ,
+.Xr au_to_newgroups 3 ,
 .Xr au_to_opaque 3 ,
-.Xr au_to_file 3 ,
-.Xr au_to_text 3 ,
 .Xr au_to_path 3 ,
+.Xr au_to_process 3 ,
 .Xr au_to_process32 3 ,
 .Xr au_to_process64 3 ,
-.Xr au_to_process 3 ,
+.Xr au_to_process_ex 3 ,
 .Xr au_to_process32_ex 3 ,
 .Xr au_to_process64_ex 3 ,
-.Xr au_to_process_ex 3 ,
+.Xr au_to_return 3 ,
 .Xr au_to_return32 3 ,
 .Xr au_to_return64 3 ,
-.Xr au_to_return 3 ,
 .Xr au_to_seq 3 ,
 .Xr au_to_socket 3 ,
 .Xr au_to_socket_ex_32 3 ,
 .Xr au_to_socket_ex_128 3 ,
+.Xr au_to_sock_inet 3 ,
 .Xr au_to_sock_inet32 3 ,
 .Xr au_to_sock_inet128 3 ,
-.Xr au_to_sock_inet 3 ,
+.Xr au_to_subject 3 ,
 .Xr au_to_subject32 3 ,
 .Xr au_to_subject64 3 ,
-.Xr au_to_subject 3 ,
+.Xr au_to_subject_ex 3 ,
 .Xr au_to_subject32_ex 3 ,
 .Xr au_to_subject64_ex 3 ,
-.Xr au_to_subject_ex 3 ,
-.Xr au_to_me 3 ,
-.Xr au_to_exec_args 3 ,
-.Xr au_to_exec_env 3 ,
-.Xr au_to_header32 3 ,
-.Xr au_to_header64 3 ,
+.Xr au_to_text 3 ,
 .Xr au_to_trailer 3 .
 .Ss Audit User Interfaces
 Audit user interfaces support the look up of information from the
 .Xr audit_user 5
 database:
-.Xr setauuser 3 ,
+.Xr au_user_mask 3 ,
 .Xr endauuser 3 ,
+.Xr setauuser 3 ,
 .Xr getauuserent 3 ,
 .Xr getauuserent_r 3 ,
 .Xr getauusernam 3 ,
 .Xr getauusernam_r 3 ,
-.Xr au_user_mask 3 ,
 .Xr getfauditflags 3 .
 .Sh SEE ALSO
 .Xr au_class 3 ,