summaryrefslogtreecommitdiffstats
path: root/contrib/openbsm
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/openbsm')
-rw-r--r--contrib/openbsm/CHANGELOG97
-rw-r--r--contrib/openbsm/FREEBSD-upgrade48
-rw-r--r--contrib/openbsm/Makefile9
-rw-r--r--contrib/openbsm/bin/Makefile10
-rw-r--r--contrib/openbsm/bin/audit/Makefile12
-rw-r--r--contrib/openbsm/bin/auditd/Makefile13
-rw-r--r--contrib/openbsm/bin/auditreduce/Makefile12
-rw-r--r--contrib/openbsm/bin/praudit/Makefile12
-rw-r--r--contrib/openbsm/bsm/Makefile22
-rw-r--r--contrib/openbsm/bsm/audit.h321
-rw-r--r--contrib/openbsm/bsm/audit_internal.h119
-rw-r--r--contrib/openbsm/bsm/audit_kevents.h605
-rw-r--r--contrib/openbsm/bsm/audit_record.h334
-rw-r--r--contrib/openbsm/config/config.h192
-rw-r--r--contrib/openbsm/etc/audit_class1
-rw-r--r--contrib/openbsm/etc/audit_control1
-rw-r--r--contrib/openbsm/etc/audit_event1
-rw-r--r--contrib/openbsm/etc/audit_user1
-rw-r--r--contrib/openbsm/etc/audit_warn1
-rw-r--r--contrib/openbsm/libbsm/Makefile125
-rw-r--r--contrib/openbsm/man/Makefile22
-rw-r--r--contrib/openbsm/tools/Makefile13
22 files changed, 245 insertions, 1726 deletions
diff --git a/contrib/openbsm/CHANGELOG b/contrib/openbsm/CHANGELOG
deleted file mode 100644
index 9856109..0000000
--- a/contrib/openbsm/CHANGELOG
+++ /dev/null
@@ -1,97 +0,0 @@
-OpenBSM 1.0 alpha 4
-
-- Remove "audit" user example from audit_user, as it's not present on most
- systems.
-- Add cannot_audit() function non-Darwin systems that wraps auditon();
- required by OpenSSH BSM support. Convert Darwin cannot_audit() into a
- function rather than a macro.
-- Library build fixed on Darwin following include file tweaks. The native
- Darwin sys/audit.h conflicts with bsm/audit.h due to duplicate types, so
- for now we force bsm_wrappers.c to not perform a nested include of
- sys/audit.h.
-
-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.
-
-OpenBSM 1.0 alpha 2
-
-- Man page formatting improvements.
-- A number of new audit event identifiers for FreeBSD, Linux, and POSIX.1b
- events.
-- Remove 'tfm' class, unused in OpenBSM.
-
-OpenBSM 1.0 alpha 1
-
-- Import of Darwin74 BSM drop
-- Use 'syslog' for audit log warnings, rather than echoing to a file in
- audit_warn.
-- Compile using BSD make infrastructure.
-- Integrate bsm/ include files from Darwin74 XNU drop into OpenBSM.
-- Narrow set of symbols and defines that are exposed in user space: don't
- compile in code relying on kernel-only types such as 'struct socket'.
-- Add README, including basic build documentation.
-- Compilation of Apple-specific notify and Machroutines now #ifdef __APPLE__.
-- Staticize libbsm global variables to avoid leakage into application.
-- Add free_au_user_ent() so that au_user_ent's don't have to be leaked.
-- Clean up bogus nul-termination checks in libbsm.
-- Add libbsm API man pages: au_class.3 au_control.3 au_event.3
- au_free_token.3 au_io.3 au_mask.3 au_token.3 au_user.3 libbsm.3.
-- Add man pages for BSM system calls: audit.2 auditctl.2 auditon.2 getaudit.2
- getauid.2 setaudit.2 setauid.2
-- Modify various libbsm interfaces to more consistently return 'errno' values
- on failure.
-- Break out au_close() into constituent parts, allowing records to be written
- to memory as well as files.
-- Prefix various defines with 'BSM_' to reduce name space pollution.
-- Added audit_internal.h, which can be used by a kernel audit implementation
- wanting to rely on libbsm components.
-- Build with warnings, and eliminate warnings.
-- Make libbsm endian-independent, storing and reading BSM are big endian
- (network byte order) rather than native byte order. More consistently
- print IP addresses using the IP address print routine. These changes
- make use of sys/endian.h from *BSD; since this isn't present on Darwin,
- add it to OpenBSM as compat/endian.h, which is used only on Darwin.
-- Import of Darwin80 BSM drop, including 64-bit file IDs, better
- documentation of private APIs, and bug fixes.
-- White space cleanup.
-- Add audit.log.5, a first cut at a man page documenting the BSM file format.
-- Teach au_read_rec() to recognize stand-alone file tokens, which are present
- at the beginning and end of Solaris audit trails. Technically, these
- appear to violate the high level BSM spec, which suggests that all tokens
- are present in records, but need to be supported.
-- Implement HEADER64, ATTR64, SUBJECT64 token types, which make it possible
- to run praudit(1) on basic Solaris BSM streams.
-- Switched to Solaris spelling of token names; Darwin spellings are now
- deprecated and will be removed in a future version of OpenBSM.
-- Adopt Solaris model for representing IPv4 and IPv6 addresses.
-- Prefer C99 types.
-- Attempt to universally adopt the BSD style(9) coding style for
- consistency.
-- auditreduce(1) now has a usage message.
-- Update support for auditctl(2) system call to support FreeBSD.
-- Add support for /dev/audit as the trigger source on FreeBSD.
-- Add additional event types for Darwin, FreeBSD, and Solaris. Annotate
- conflicts (there are a few, unfortunately). Correct spellings, comment,
- sort, etc. These include {get,set}res[ug]id(), sendfile(), lchflags(),
- eaccess(), kqueue(), kevent(), poll(), lchmod().
-- Relicensed under a BSD license, many thanks to Apple, Inc!
-- Many bug fixes, cleanups, thread safety in the class, control, event,
- and user system audit databases. Annotate some persisting atomicity
- bugs associated with the API and implementation.
-- Add audump test tool.
-- Adopt OpenSolaris BSM API memory semantics: caller allocates memory,
- or static memory is returned for non-_r() versions of API calls.
- _free() calls dropped as a result, and source code compatibility with
- OpenSolaris improved significantly.
-- Annotate BSM events with origin OS and compatibility information.
-- auditd(8), audit(8) added to the OpenBSM distribution. auditd extended
- to support reloading of kernel event table.
-- Allow comments in /etc/security configuration files.
-
-$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#12 $
diff --git a/contrib/openbsm/FREEBSD-upgrade b/contrib/openbsm/FREEBSD-upgrade
new file mode 100644
index 0000000..023223c
--- /dev/null
+++ b/contrib/openbsm/FREEBSD-upgrade
@@ -0,0 +1,48 @@
+Upgrade Instructions for OpenBSM
+--------------------------------
+
+OpenBSM integrates into the FreeBSD source tree in several places:
+
+src/contrib/openbsm The OpenBSM distribution itself
+src/sys/bsm Modified versions of some bsm/ include files
+src/sys/security/audit Kernel audit framework, some OpenBSM-based files
+src/usr.sbin/*audit* Makefiles for various OpenBSM tools
+src/etc/Makefile Installation of /etc OpenBSM files
+src/lib/libbsm/* Build for OpenBSM library
+
+OpenBSM is normally built using an integrated autoconf/automake build
+system. For the purposes of tight integration with FreeBSD, we use an
+adapted BSD make (bmake) build system loosely based on the automake
+setup. We also rely on a static config.h generated when OpenBSM is
+imported, rather than re-configuring every build. This leads to a
+more reproduceable build environment, and avoids dependence on things
+not in the base tree (i.e., autoconf, automake, GNU make, etc). An
+upgrade of OpenBSM generally involves the following steps:
+
+- Vendor import of OpenBSM into src/contrib.
+- Run configure, commit src/contrib/openbsm/config/config.h.
+- Replication of src/contrib/openbsm/bsm changes into src/sys/bsm.
+- Possible updates to src/sys/security/audit, especially relating to
+ audit_bsm_token.c.
+- Update any library, tool, or etc BSD Makefiles to add new files,
+ defines, or other generally useful or necessary things.
+
+Normally, the CVS vendor import goes along the following lines:
+
+ cd ~/p4/projects/trustedbsd/openbsm
+ cvs -n -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import \
+ src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1
+
+Replacing the version string as required. Remove the "-n" argument once
+the import is tested in order to perform the actual import.
+
+Propagation of changes to src/sys/{bsm,security/audit} is something that
+requires careful coordination and attention to detail. These files are
+not on CVS vendor branches, but do have the same local vs. vendor merge
+issues. Remember that contrib/openbsm (and the rest of the system) will
+be built with the version of the bsm/ include files in src/sys/bsm, not
+the version in contrib/openbsm/bsm, so buildworld tests before committing
+are necessary, and the commits to various parts of the system must be
+made in close succession.
+
+$FreeBSD$
diff --git a/contrib/openbsm/Makefile b/contrib/openbsm/Makefile
deleted file mode 100644
index b480723..0000000
--- a/contrib/openbsm/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/Makefile#2 $
-#
-
-SUBDIR= bsm \
- libbsm \
- bin
-
-.include <bsd.subdir.mk>
diff --git a/contrib/openbsm/bin/Makefile b/contrib/openbsm/bin/Makefile
deleted file mode 100644
index 3bc4a6c..0000000
--- a/contrib/openbsm/bin/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile#4 $
-#
-
-SUBDIR= audit \
- auditd \
- auditreduce \
- praudit
-
-.include <bsd.subdir.mk>
diff --git a/contrib/openbsm/bin/audit/Makefile b/contrib/openbsm/bin/audit/Makefile
deleted file mode 100644
index cec37ea..0000000
--- a/contrib/openbsm/bin/audit/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 $
-#
-
-CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I.
-PROG= audit
-MAN= audit.8
-DPADD= /usr/lib/libbsm.a
-LDADD= -lbsm
-BINDIR= /usr/sbin
-
-.include <bsd.prog.mk>
diff --git a/contrib/openbsm/bin/auditd/Makefile b/contrib/openbsm/bin/auditd/Makefile
deleted file mode 100644
index fbbdc47..0000000
--- a/contrib/openbsm/bin/auditd/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#2 $
-#
-
-CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I.
-PROG= auditd
-SRCS= audit_warn.c auditd.c
-MAN= auditd.8
-DPADD= /usr/lib/libbsm.a
-LDADD= -lbsm
-BINDIR= /usr/sbin
-
-.include <bsd.prog.mk>
diff --git a/contrib/openbsm/bin/auditreduce/Makefile b/contrib/openbsm/bin/auditreduce/Makefile
deleted file mode 100644
index f4c292a..0000000
--- a/contrib/openbsm/bin/auditreduce/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#4 $
-#
-
-CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I.
-PROG= auditreduce
-MAN= auditreduce.1
-DPADD= /usr/lib/libbsm.a
-LDADD= -lbsm
-BINDIR= /usr/sbin
-
-.include <bsd.prog.mk>
diff --git a/contrib/openbsm/bin/praudit/Makefile b/contrib/openbsm/bin/praudit/Makefile
deleted file mode 100644
index 34e136b..0000000
--- a/contrib/openbsm/bin/praudit/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#4 $
-#
-
-CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I.
-PROG= praudit
-MAN= praudit.1
-DPADD= /usr/lib/libbsm.a
-LDADD= -lbsm
-BINDIR= /usr/sbin
-
-.include <bsd.prog.mk>
diff --git a/contrib/openbsm/bsm/Makefile b/contrib/openbsm/bsm/Makefile
deleted file mode 100644
index ba63701..0000000
--- a/contrib/openbsm/bsm/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile#7 $
-#
-
-INCS= audit.h \
- audit_internal.h \
- audit_kevents.h \
- audit_record.h \
- audit_uevents.h \
- libbsm.h
-
-TARGET= ${DESTDIR}/usr/include/bsm
-
-all:
-default:
-depend:
-clean:
-
-install:
- mkdir -p -m 0755 ${TARGET}
- install -o root -g wheel -m 0644 ${INCS} ${TARGET}
-
diff --git a/contrib/openbsm/bsm/audit.h b/contrib/openbsm/bsm/audit.h
deleted file mode 100644
index d67b853..0000000
--- a/contrib/openbsm/bsm/audit.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 2005 Apple Computer, Inc.
- * All rights reserved.
- *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
- * 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 Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 $
- */
-
-#ifndef _BSM_AUDIT_H
-#define _BSM_AUDIT_H
-
-#define AUDIT_RECORD_MAGIC 0x828a0f1b
-#define MAX_AUDIT_RECORDS 20
-#define MAXAUDITDATA (0x8000 - 1)
-#define MAX_AUDIT_RECORD_SIZE MAXAUDITDATA
-#define MIN_AUDIT_FILE_SIZE (512 * 1024)
-
-/*
- * Triggers for the audit daemon.
- */
-#define AUDIT_TRIGGER_MIN 1
-#define AUDIT_TRIGGER_LOW_SPACE 1
-#define AUDIT_TRIGGER_OPEN_NEW 2
-#define AUDIT_TRIGGER_READ_FILE 3
-#define AUDIT_TRIGGER_CLOSE_AND_DIE 4
-#define AUDIT_TRIGGER_NO_SPACE 5
-#define AUDIT_TRIGGER_MAX 5
-
-/*
- * Special file that will be read for trigger events from the kernel
- * (FreeBSD).
- */
-#define AUDIT_TRIGGER_FILE "/dev/audit"
-
-/*
- * Pre-defined audit IDs
- */
-#define AU_DEFAUDITID -1
-
-/*
- * Define the masks for the classes of audit events.
- */
-#define AU_NULL 0x00000000
-#define AU_FREAD 0x00000001
-#define AU_FWRITE 0x00000002
-#define AU_FACCESS 0x00000004
-#define AU_FMODIFY 0x00000008
-#define AU_FCREATE 0x00000010
-#define AU_FDELETE 0x00000020
-#define AU_CLOSE 0x00000040
-#define AU_PROCESS 0x00000080
-#define AU_NET 0x00000100
-#define AU_IPC 0x00000200
-#define AU_NONAT 0x00000400
-#define AU_ADMIN 0x00000800
-#define AU_LOGIN 0x00001000
-#define AU_TFM 0x00002000
-#define AU_APPL 0x00004000
-#define AU_SETL 0x00008000
-#define AU_IFLOAT 0x00010000
-#define AU_PRIV 0x00020000
-#define AU_MAC_RW 0x00040000
-#define AU_XCONN 0x00080000
-#define AU_XCREATE 0x00100000
-#define AU_XDELETE 0x00200000
-#define AU_XIFLOAT 0x00400000
-#define AU_XPRIVS 0x00800000
-#define AU_XPRIVF 0x01000000
-#define AU_XMOVE 0x02000000
-#define AU_XDACF 0x04000000
-#define AU_XMACF 0x08000000
-#define AU_XSECATTR 0x10000000
-#define AU_IOCTL 0x20000000
-#define AU_EXEC 0x40000000
-#define AU_OTHER 0x80000000
-#define AU_ALL 0xffffffff
-
-/*
- * IPC types.
- */
-#define AT_IPC_MSG ((u_char)1) /* Message IPC id. */
-#define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */
-#define AT_IPC_SHM ((u_char)3) /* Shared mem IPC id. */
-
-/*
- * Audit conditions.
- */
-#define AUC_UNSET 0
-#define AUC_AUDITING 1
-#define AUC_NOAUDIT 2
-#define AUC_DISABLED -1
-
-/*
- * auditon(2) commands.
- */
-#define A_GETPOLICY 2
-#define A_SETPOLICY 3
-#define A_GETKMASK 4
-#define A_SETKMASK 5
-#define A_GETQCTRL 6
-#define A_SETQCTRL 7
-#define A_GETCWD 8
-#define A_GETCAR 9
-#define A_GETSTAT 12
-#define A_SETSTAT 13
-#define A_SETUMASK 14
-#define A_SETSMASK 15
-#define A_GETCOND 20
-#define A_SETCOND 21
-#define A_GETCLASS 22
-#define A_SETCLASS 23
-#define A_GETPINFO 24
-#define A_SETPMASK 25
-#define A_SETFSIZE 26
-#define A_GETFSIZE 27
-#define A_GETPINFO_ADDR 28
-#define A_GETKAUDIT 29
-#define A_SETKAUDIT 30
-#define A_SENDTRIGGER 31
-
-/*
- * Audit policy controls.
- */
-#define AUDIT_CNT 0x0001
-#define AUDIT_AHLT 0x0002
-#define AUDIT_ARGV 0x0004
-#define AUDIT_ARGE 0x0008
-#define AUDIT_SEQ 0x0010
-#define AUDIT_WINDATA 0x0020
-#define AUDIT_USER 0x0040
-#define AUDIT_GROUP 0x0080
-#define AUDIT_TRAIL 0x0100
-#define AUDIT_PATH 0x0200
-#define AUDIT_SCNT 0x0400
-#define AUDIT_PUBLIC 0x0800
-#define AUDIT_ZONENAME 0x1000
-#define AUDIT_PERZONE 0x2000
-
-/*
- * Audit queue control parameters.
- */
-#define AQ_HIWATER 100
-#define AQ_MAXHIGH 10000
-#define AQ_LOWATER 10
-#define AQ_BUFSZ 1024
-#define AQ_MAXBUFSZ 1048576
-
-/*
- * Default minimum percentage free space on file system.
- */
-#define AU_FS_MINFREE 20
-
-/*
- * Type definitions used indicating the length of variable length addresses
- * in tokens containing addresses, such as header fields.
- */
-#define AU_IPv4 4
-#define AU_IPv6 16
-
-__BEGIN_DECLS
-
-typedef uid_t au_id_t;
-typedef pid_t au_asid_t;
-typedef u_int16_t au_event_t;
-typedef u_int16_t au_emod_t;
-typedef u_int32_t au_class_t;
-
-struct au_tid {
- dev_t port;
- u_int32_t machine;
-};
-typedef struct au_tid au_tid_t;
-
-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;
-
-struct au_mask {
- unsigned int am_success; /* Success bits. */
- unsigned int am_failure; /* Failure bits. */
-};
-typedef struct au_mask au_mask_t;
-
-struct auditinfo {
- au_id_t ai_auid; /* Audit user ID. */
- au_mask_t ai_mask; /* Audit masks. */
- au_tid_t ai_termid; /* Terminal ID. */
- au_asid_t ai_asid; /* Audit session ID. */
-};
-typedef struct auditinfo auditinfo_t;
-
-struct auditinfo_addr {
- au_id_t ai_auid; /* Audit user ID. */
- au_mask_t ai_mask; /* Audit masks. */
- au_tid_addr_t ai_termid; /* Terminal ID. */
- au_asid_t ai_asid; /* Audit session ID. */
-};
-typedef struct auditinfo_addr auditinfo_addr_t;
-
-struct auditpinfo {
- pid_t ap_pid; /* ID of target process. */
- au_id_t ap_auid; /* Audit user ID. */
- au_mask_t ap_mask; /* Audit masks. */
- au_tid_t ap_termid; /* Terminal ID. */
- au_asid_t ap_asid; /* Audit session ID. */
-};
-typedef struct auditpinfo auditpinfo_t;
-
-struct auditpinfo_addr {
- pid_t ap_pid; /* ID of target process. */
- au_id_t ap_auid; /* Audit user ID. */
- au_mask_t ap_mask; /* Audit masks. */
- au_tid_addr_t ap_termid; /* Terminal ID. */
- au_asid_t ap_asid; /* Audit session ID. */
-};
-typedef struct auditpinfo_addr auditpinfo_addr_t;
-
-/*
- * Contents of token_t are opaque outside of libbsm.
- */
-typedef struct au_token token_t;
-
-/*
- * Kernel audit queue control parameters.
- */
-struct au_qctrl {
- size_t aq_hiwater;
- size_t aq_lowater;
- size_t aq_bufsz;
- clock_t aq_delay;
- int aq_minfree; /* Minimum filesystem percent free space. */
-};
-typedef struct au_qctrl au_qctrl_t;
-
-/*
- * Structure for the audit statistics.
- */
-struct audit_stat {
- unsigned int as_version;
- unsigned int as_numevent;
- int as_generated;
- int as_nonattrib;
- int as_kernel;
- int as_audit;
- int as_auditctl;
- int as_enqueue;
- int as_written;
- int as_wblocked;
- int as_rblocked;
- int as_dropped;
- int as_totalsize;
- unsigned int as_memused;
-};
-typedef struct audit_stat au_stat_t;
-
-/*
- * Structure for the audit file statistics.
- */
-struct audit_fstat {
- u_quad_t af_filesz;
- u_quad_t af_currsz;
-};
-typedef struct audit_fstat au_fstat_t;
-
-/*
- * Audit to event class mapping.
- */
-struct au_evclass_map {
- au_event_t ec_number;
- au_class_t ec_class;
-};
-typedef struct au_evclass_map au_evclass_map_t;
-
-/*
- * Audit system calls.
- */
-#if !defined(_KERNEL) && !defined(KERNEL)
-int audit(const void *, int);
-int auditon(int, void *, int);
-int auditctl(const char *);
-int getauid(au_id_t *);
-int setauid(const au_id_t *);
-int getaudit(struct auditinfo *);
-int setaudit(const struct auditinfo *);
-int getaudit_addr(struct auditinfo_addr *, int);
-int setaudit_addr(const struct auditinfo_addr *, int);
-#endif /* defined(_KERNEL) || defined(KERNEL) */
-
-__END_DECLS
-
-#endif /* !_BSM_AUDIT_H */
diff --git a/contrib/openbsm/bsm/audit_internal.h b/contrib/openbsm/bsm/audit_internal.h
deleted file mode 100644
index b579c1b..0000000
--- a/contrib/openbsm/bsm/audit_internal.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2005 Apple Computer, Inc.
- * Copyright (c) 2005 SPARTA, Inc.
- * All rights reserved.
- *
- * This code was developed in part by Robert N. M. Watson, Senior Principal
- * Scientist, SPARTA, Inc.
- *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
- * 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 Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#15 $
- */
-
-#ifndef _AUDIT_INTERNAL_H
-#define _AUDIT_INTERNAL_H
-
-#if defined(__linux__) && !defined(__unused)
-#define __unused
-#endif
-
-/*
- * audit_internal.h contains private interfaces that are shared by user space
- * and the kernel for the purposes of assembling audit records. Applications
- * should not include this file or use the APIs found within, or it may be
- * broken with future releases of OpenBSM, which may delete, modify, or
- * otherwise break these interfaces or the assumptions they rely on.
- */
-struct au_token {
- u_char *t_data;
- size_t len;
- TAILQ_ENTRY(au_token) tokens;
-};
-
-struct au_record {
- char used; /* Record currently in use? */
- int desc; /* Descriptor for record. */
- TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */
- u_char *data;
- size_t len;
- LIST_ENTRY(au_record) au_rec_q;
-};
-typedef struct au_record au_record_t;
-
-
-/*
- * We could determined the header and trailer sizes by defining appropriate
- * structures. We hold off that approach until we have a consistent way of
- * using structures for all tokens. This is not straightforward since these
- * token structures may contain pointers of whose contents we do not know the
- * size (e.g text tokens).
- */
-#define AUDIT_HEADER_SIZE 18
-#define AUDIT_TRAILER_SIZE 7
-
-/*
- * BSM token streams store fields in big endian byte order, so as to be
- * portable; when encoding and decoding, we must convert byte orders for
- * typed values.
- */
-#define ADD_U_CHAR(loc, val) \
- do { \
- *(loc) = (val); \
- (loc) += sizeof(u_char); \
- } while(0)
-
-
-#define ADD_U_INT16(loc, val) \
- do { \
- be16enc((loc), (val)); \
- (loc) += sizeof(u_int16_t); \
- } while(0)
-
-#define ADD_U_INT32(loc, val) \
- do { \
- be32enc((loc), (val)); \
- (loc) += sizeof(u_int32_t); \
- } while(0)
-
-#define ADD_U_INT64(loc, val) \
- do { \
- be64enc((loc), (val)); \
- (loc) += sizeof(u_int64_t); \
- } while(0)
-
-#define ADD_MEM(loc, data, size) \
- do { \
- memcpy((loc), (data), (size)); \
- (loc) += size; \
- } while(0)
-
-#define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size)
-
-#endif /* !_AUDIT_INTERNAL_H_ */
diff --git a/contrib/openbsm/bsm/audit_kevents.h b/contrib/openbsm/bsm/audit_kevents.h
deleted file mode 100644
index cd55883..0000000
--- a/contrib/openbsm/bsm/audit_kevents.h
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Copyright (c) 2005 Apple Computer, Inc.
- * All rights reserved.
- *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
- * 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 Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 $
- */
-
-#ifndef _BSM_AUDIT_KEVENTS_H_
-#define _BSM_AUDIT_KEVENTS_H_
-
-/*
- * Values marked as AUE_NULL are not required to be audited as per CAPP.
- *
- * Some conflicts exist in the assignment of name to event number mappings
- * between BSM implementations. In general, we prefer the OpenSolaris
- * definition as we consider Solaris BSM to be authoritative. _DARWIN_ has
- * been inserted for the Darwin variants. If necessary, other tags will be
- * added in the future.
- */
-#define AUE_NULL 0
-#define AUE_EXIT 1
-#define AUE_FORK 2
-#define AUE_OPEN 3
-#define AUE_CREAT 4
-#define AUE_LINK 5
-#define AUE_UNLINK 6
-#define AUE_DELETE AUE_UNLINK
-#define AUE_EXEC 7
-#define AUE_CHDIR 8
-#define AUE_MKNOD 9
-#define AUE_CHMOD 10
-#define AUE_CHOWN 11
-#define AUE_UMOUNT 12
-#define AUE_JUNK 13 /* Solaris-specific. */
-#define AUE_ACCESS 14
-#define AUE_CHECKUSERACCESS AUE_ACCESS
-#define AUE_KILL 15
-#define AUE_STAT 16
-#define AUE_LSTAT 17
-#define AUE_ACCT 18
-#define AUE_MCTL 19 /* Solaris-specific. */
-#define AUE_REBOOT 20 /* XXX: Darwin conflict. */
-#define AUE_SYMLINK 21
-#define AUE_READLINK 22
-#define AUE_EXECVE 23
-#define AUE_CHROOT 24
-#define AUE_VFORK 25
-#define AUE_SETGROUPS 26
-#define AUE_SETPGRP 27
-#define AUE_SWAPON 28
-#define AUE_SETHOSTNAME 29 /* XXX: Darwin conflict. */
-#define AUE_FCNTL 30
-#define AUE_SETPRIORITY 31 /* XXX: Darwin conflict. */
-#define AUE_CONNECT 32
-#define AUE_ACCEPT 33
-#define AUE_BIND 34
-#define AUE_SETSOCKOPT 35
-#define AUE_VTRACE 36 /* Solaris-specific. */
-#define AUE_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */
-#define AUE_FCHOWN 38
-#define AUE_FCHMOD 39
-#define AUE_SETREUID 40
-#define AUE_SETREGID 41
-#define AUE_RENAME 42
-#define AUE_TRUNCATE 43 /* XXX: Darwin conflict. */
-#define AUE_FTRUNCATE 44 /* XXX: Darwin conflict. */
-#define AUE_FLOCK 45 /* XXX: Darwin conflict. */
-#define AUE_SHUTDOWN 46
-#define AUE_MKDIR 47
-#define AUE_RMDIR 48
-#define AUE_UTIMES 49
-#define AUE_ADJTIME 50
-#define AUE_SETRLIMIT 51
-#define AUE_KILLPG 52
-#define AUE_NFS_SVC 53 /* XXX: Darwin conflict. */
-#define AUE_STATFS 54
-#define AUE_FSTATFS 55
-#define AUE_UNMOUNT 56 /* XXX: Darwin conflict. */
-#define AUE_ASYNC_DAEMON 57
-#define AUE_NFS_GETFH 58 /* XXX: Darwin conflict. */
-#define AUE_SETDOMAINNAME 59
-#define AUE_QUOTACTL 60 /* XXX: Darwin conflict. */
-#define AUE_EXPORTFS 61
-#define AUE_MOUNT 62
-#define AUE_SEMSYS 63
-#define AUE_MSGSYS 64
-#define AUE_SHMSYS 65
-#define AUE_BSMSYS 66 /* Solaris-specific. */
-#define AUE_RFSSYS 67 /* Solaris-specific. */
-#define AUE_FCHDIR 68
-#define AUE_FCHROOT 69
-#define AUE_VPIXSYS 70 /* Solaris-specific. */
-#define AUE_PATHCONF 71
-#define AUE_OPEN_R 72
-#define AUE_OPEN_RC 73
-#define AUE_OPEN_RT 74
-#define AUE_OPEN_RTC 75
-#define AUE_OPEN_W 76
-#define AUE_OPEN_WC 77
-#define AUE_OPEN_WT 78
-#define AUE_OPEN_WTC 79
-#define AUE_OPEN_RW 80
-#define AUE_OPEN_RWC 81
-#define AUE_OPEN_RWT 82
-#define AUE_OPEN_RWTC 83
-#define AUE_MSGCTL 84
-#define AUE_MSGCTL_RMID 85
-#define AUE_MSGCTL_SET 86
-#define AUE_MSGCTL_STAT 87
-#define AUE_MSGGET 88
-#define AUE_MSGRCV 89
-#define AUE_MSGSND 90
-#define AUE_SHMCTL 91
-#define AUE_SHMCTL_RMID 92
-#define AUE_SHMCTL_SET 93
-#define AUE_SHMCTL_STAT 94
-#define AUE_SHMGET 95
-#define AUE_SHMAT 96
-#define AUE_SHMDT 97
-#define AUE_SEMCTL 98
-#define AUE_SEMCTL_RMID 99
-#define AUE_SEMCTL_SET 100
-#define AUE_SEMCTL_STAT 101
-#define AUE_SEMCTL_GETNCNT 102
-#define AUE_SEMCTL_GETPID 103
-#define AUE_SEMCTL_GETVAL 104
-#define AUE_SEMCTL_GETALL 105
-#define AUE_SEMCTL_GETZCNT 106
-#define AUE_SEMCTL_SETVAL 107
-#define AUE_SEMCTL_SETALL 108
-#define AUE_SEMGET 109
-#define AUE_SEMOP 110
-#define AUE_CORE 111 /* Solaris-specific, currently. */
-#define AUE_CLOSE 112
-#define AUE_SYSTEMBOOT 113
-#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-specific. */
-#define AUE_NFSSVC_EXIT 115 /* Solaris-specific. */
-#define AUE_WRITEL 128 /* Solaris-specific. */
-#define AUE_WRITEVL 129 /* Solaris-specific. */
-#define AUE_GETAUID 130
-#define AUE_SETAUID 131
-#define AUE_GETAUDIT 132
-#define AUE_SETAUDIT 133
-#define AUE_GETUSERAUDIT 134 /* Solaris-specific. */
-#define AUE_SETUSERAUDIT 135 /* Solaris-specific. */
-#define AUE_AUDITSVC 136 /* Solaris-specific. */
-#define AUE_AUDITUSER 137 /* Solaris-specific. */
-#define AUE_AUDITON 138
-#define AUE_AUDITON_GTERMID 139 /* Solaris-specific. */
-#define AUE_AUDITON_STERMID 140 /* Solaris-specific. */
-#define AUE_AUDITON_GPOLICY 141
-#define AUE_AUDITON_SPOLICY 142
-#define AUE_AUDITON_GQCTRL 145
-#define AUE_AUDITON_SQCTRL 146
-#define AUE_GETKERNSTATE 147 /* Solaris-specific. */
-#define AUE_SETKERNSTATE 148 /* Solaris-specific. */
-#define AUE_GETPORTAUDIT 149 /* Solaris-specific. */
-#define AUE_AUDISTAT 150 /* Solaris-specific. */
-#define AUE_ENTERPROM 153 /* Solaris-specific. */
-#define AUE_EXITPROM 154 /* Solaris-specific. */
-#define AUE_IOCTL 158
-#define AUE_SOCKET 183
-#define AUE_SENDTO 184
-#define AUE_PIPE 185
-#define AUE_SOCKETPAIR 186 /* XXX: Darwin conflict. */
-#define AUE_SEND 187
-#define AUE_SENDMSG 188
-#define AUE_RECV 189
-#define AUE_RECVMSG 190
-#define AUE_RECVFROM 191
-#define AUE_READ 192
-#define AUE_LSEEK 194
-#define AUE_WRITE 195
-#define AUE_WRITEV 196
-#define AUE_NFS 197 /* Solaris-specific. */
-#define AUE_READV 198
- /* XXXRW: XXX Solaris old stat()? */
-#define AUE_SETUID 200 /* XXXRW: Solaris old setuid? */
-#define AUE_STIME 201 /* XXXRW: Solaris old stime? */
-#define AUE_UTIME 202 /* XXXRW: Solaris old utime? */
-#define AUE_NICE 203 /* XXXRW: Solaris old nice? */
- /* XXXRW: Solaris old setpgrp? */
-#define AUE_SETGID 205 /* XXXRW: Solaris old setgid? */
- /* XXXRW: Solaris readl? */
- /* XXXRW: Solaris readvl()? */
-#define AUE_DUP2 209
-#define AUE_MMAP 210
-#define AUE_AUDIT 211
-#define AUE_PRIOCNTLSYS 212
-#define AUE_MUNMAP 213
-#define AUE_SETEGID 214
-#define AUE_SETEUID 215
-#define AUE_PUTMSG 216
-#define AUE_GETMSG 217 /* Solaris-specific. */
-#define AUE_PUTPMSG 218 /* Solaris-specific. */
-#define AUE_GETPMSG 219 /* Solaris-specific. */
-#define AUE_AUDITSYS 220 /* Solaris-specific. */
-#define AUE_AUDITON_GETKMASK 221
-#define AUE_AUDITON_SETKMASK 222
-#define AUE_AUDITON_GETCWD 223
-#define AUE_AUDITON_GETCAR 224
-#define AUE_AUDITON_GETSTAT 225
-#define AUE_AUDITON_SETSTAT 226
-#define AUE_AUDITON_SETUMASK 227
-#define AUE_AUDITON_SETSMASK 228
-#define AUE_AUDITON_GETCOND 229
-#define AUE_AUDITON_SETCOND 230
-#define AUE_AUDITON_GETCLASS 231
-#define AUE_AUDITON_SETCLASS 232
-#define AUE_UTSSYS 233 /* Solaris-specific. */
-#define AUE_STATVFS 234
-#define AUE_XSTAT 235
-#define AUE_LXSTAT 236
-#define AUE_LCHOWN 237
-#define AUE_MEMCNTL 238 /* Solaris-specific. */
-#define AUE_SYSINFO 239 /* Solaris-specific. */
-#define AUE_XMKNOD 240 /* Solaris-specific. */
-#define AUE_FORK1 241
- /* XXXRW: Solaris modctl()? */
-#define AUE_MODLOAD 243
-#define AUE_MODUNLOAD 244
-#define AUE_MODCONFIG 245 /* Solaris-specific. */
-#define AUE_MODADDMAJ 246 /* Solaris-specific. */
-#define AUE_SOCKACCEPT 247
-#define AUE_SOCKCONNECT 248
-#define AUE_SOCKSEND 249
-#define AUE_SOCKRECEIVE 250
-#define AUE_ACLSET 251
-#define AUE_FACLSET 252
-#define AUE_DOORFS_DOOR_CALL 254 /* Solaris-specific. */
-#define AUE_DOORFS_DOOR_RETURN 255 /* Solaris-specific. */
-#define AUE_DOORFS_DOOR_CREATE 256 /* Solaris-specific. */
-#define AUE_DOORFS_DOOR_REVOKE 257 /* Solaris-specific. */
-#define AUE_DOORFS_DOOR_INFO 258 /* Solaris-specific. */
-#define AUE_DOORFS_DOOR_CRED 259 /* Solaris-specific. */
-#define AUE_DOORFS_DOOR_BIND 260 /* Solaris-specific. */
-#define AUE_DOORFS_DOOR_UNBIND 261 /* Solaris-specific. */
-#define AUE_P_ONLINE 262 /* Solaris-specific. */
-#define AUE_PROCESSOR_BIND 263 /* Solaris-specific. */
-#define AUE_INST_SYNC 264 /* Solaris-specific. */
-#define AUE_SOCK_CONFIG 265 /* Solaris-specific. */
-#define AUE_SETAUDIT_ADDR 266
-#define AUE_GETAUDIT_ADDR 267
-#define AUE_CLOCK_SETTIME 287
-#define AUE_NTP_ADJTIME 288
-
-/*
- * Events added for Apple Darwin that potentially collide with future Solaris
- * BSM events. These are assigned AUE_DARWIN prefixes, and are deprecated in
- * new trails. Systems generating these events should switch to the new
- * identifiers that avoid colliding with the Solaris identifier space.
- */
-#define AUE_DARWIN_GETFSSTAT 301
-#define AUE_DARWIN_PTRACE 302
-#define AUE_DARWIN_CHFLAGS 303
-#define AUE_DARWIN_FCHFLAGS 304
-#define AUE_DARWIN_PROFILE 305
-#define AUE_DARWIN_KTRACE 306
-#define AUE_DARWIN_SETLOGIN 307
-#define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */
-#define AUE_DARWIN_REVOKE 309
-#define AUE_DARWIN_UMASK 310
-#define AUE_DARWIN_MPROTECT 311
-#define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */
-#define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */
-#define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */
-#define AUE_DARWIN_MKFIFO 315
-#define AUE_DARWIN_POLL 316
-#define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */
-#define AUE_DARWIN_FUTIMES 318
-#define AUE_DARWIN_SETSID 319
-#define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */
-#define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */
-#define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */
-#define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */
-#define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */
-#define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */
-#define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE
-#define AUE_DARWIN_FSTAT 326
-#define AUE_DARWIN_FPATHCONF 327
-#define AUE_DARWIN_GETDIRENTRIES 328
-#define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */
-#define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */
-#define AUE_DARWIN_SYSCTL 331
-#define AUE_DARWIN_MLOCK 332
-#define AUE_DARWIN_MUNLOCK 333
-#define AUE_DARWIN_UNDELETE 334
-#define AUE_DARWIN_GETATTRLIST 335 /* Darwin-specific. */
-#define AUE_DARWIN_SETATTRLIST 336 /* Darwin-specific. */
-#define AUE_DARWIN_GETDIRENTRIESATTR 337 /* Darwin-specific. */
-#define AUE_DARWIN_EXCHANGEDATA 338 /* Darwin-specific. */
-#define AUE_DARWIN_SEARCHFS 339 /* Darwin-specific. */
-#define AUE_DARWIN_MINHERIT 340
-#define AUE_DARWIN_SEMCONFIG 341
-#define AUE_DARWIN_SEMOPEN 342
-#define AUE_DARWIN_SEMCLOSE 343
-#define AUE_DARWIN_SEMUNLINK 344
-#define AUE_DARWIN_SHMOPEN 345
-#define AUE_DARWIN_SHMUNLINK 346
-#define AUE_DARWIN_LOADSHFILE 347 /* Darwin-specific. */
-#define AUE_DARWIN_RESETSHFILE 348 /* Darwin-specific. */
-#define AUE_DARWIN_NEWSYSTEMSHREG 349 /* Darwin-specific. */
-#define AUE_DARWIN_PTHREADKILL 350 /* Darwin-specific. */
-#define AUE_DARWIN_PTHREADSIGMASK 351 /* Darwin-specific. */
-#define AUE_DARWIN_AUDITCTL 352
-#define AUE_DARWIN_RFORK 353
-#define AUE_DARWIN_LCHMOD 354
-#define AUE_DARWIN_SWAPOFF 355
-#define AUE_DARWIN_INITPROCESS 356 /* Darwin-specific. */
-#define AUE_DARWIN_MAPFD 357 /* Darwin-specific. */
-#define AUE_DARWIN_TASKFORPID 358 /* Darwin-specific. */
-#define AUE_DARWIN_PIDFORTASK 359 /* Darwin-specific. */
-#define AUE_DARWIN_SYSCTL_NONADMIN 360
-#define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */
-
-/*
- * Audit event identifiers added as part of OpenBSM, generally corresponding
- * to events in FreeBSD, Darwin, and Linux that were not present in Solaris.
- * These often duplicate events added to the Solaris set by Darwin, but use
- * event identifiers in a higher range in order to avoid colliding with
- * future Solaris additions.
- */
-#define AUE_GETFSSTAT 43001
-#define AUE_PTRACE 43002
-#define AUE_CHFLAGS 43003
-#define AUE_FCHFLAGS 43004
-#define AUE_PROFILE 43005
-#define AUE_KTRACE 43006
-#define AUE_SETLOGIN 43007
-#define AUE_REVOKE 43008
-#define AUE_UMASK 43009
-#define AUE_MPROTECT 43010
-#define AUE_MKFIFO 43011
-#define AUE_POLL 43012
-#define AUE_FUTIMES 43013
-#define AUE_SETSID 43014
-#define AUE_SETPRIVEXEC 43015 /* Darwin-specific. */
-#define AUE_ADDPROFILE 43016 /* Darwin-specific. */
-#define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */
-#define AUE_KDBUGTRACE AUE_KDEBUGTRACE
-#define AUE_FSTAT 43018
-#define AUE_FPATHCONF 43019
-#define AUE_GETDIRENTRIES 43020
-#define AUE_SYSCTL 43021
-#define AUE_MLOCK 43022
-#define AUE_MUNLOCK 43023
-#define AUE_UNDELETE 43024
-#define AUE_GETATTRLIST 43025 /* Darwin-specific. */
-#define AUE_SETATTRLIST 43026 /* Darwin-specific. */
-#define AUE_GETDIRENTRIESATTR 43027 /* Darwin-specific. */
-#define AUE_EXCHANGEDATA 43028 /* Darwin-specific. */
-#define AUE_SEARCHFS 43029 /* Darwin-specific. */
-#define AUE_MINHERIT 43030
-#define AUE_SEMCONFIG 43031
-#define AUE_SEMOPEN 43032
-#define AUE_SEMCLOSE 43033
-#define AUE_SEMUNLINK 43034
-#define AUE_SHMOPEN 43035
-#define AUE_SHMUNLINK 43036
-#define AUE_LOADSHFILE 43037 /* Darwin-specific. */
-#define AUE_RESETSHFILE 43038 /* Darwin-specific. */
-#define AUE_NEWSYSTEMSHREG 43039 /* Darwin-specific. */
-#define AUE_PTHREADKILL 43040 /* Darwin-specific. */
-#define AUE_PTHREADSIGMASK 43041 /* Darwin-specific. */
-#define AUE_AUDITCTL 43042
-#define AUE_RFORK 43043
-#define AUE_LCHMOD 43044
-#define AUE_SWAPOFF 43045
-#define AUE_INITPROCESS 43046 /* Darwin-specific. */
-#define AUE_MAPFD 43047 /* Darwin-specific. */
-#define AUE_TASKFORPID 43048 /* Darwin-specific. */
-#define AUE_PIDFORTASK 43049 /* Darwin-specific. */
-#define AUE_SYSCTL_NONADMIN 43050
-#define AUE_COPYFILE 43051 /* Darwin-specific. */
-
-/*
- * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin
- * in the future.
- */
-#define AUE_LUTIMES 43052
-#define AUE_LCHFLAGS 43053 /* FreeBSD-specific. */
-#define AUE_SENDFILE 43054 /* BSD/Linux-specific. */
-#define AUE_USELIB 43055 /* Linux-specific. */
-#define AUE_GETRESUID 43056
-#define AUE_SETRESUID 43057
-#define AUE_GETRESGID 43058
-#define AUE_SETRESGID 43059
-#define AUE_WAIT4 43060 /* FreeBSD-specific. */
-#define AUE_LGETFH 43061 /* FreeBSD-specific. */
-#define AUE_FHSTATFS 43062 /* FreeBSD-specific. */
-#define AUE_FHOPEN 43063 /* FreeBSD-specific. */
-#define AUE_FHSTAT 43064 /* FreeBSD-specific. */
-#define AUE_JAIL 43065 /* FreeBSD-specific. */
-#define AUE_EACCESS 43066 /* FreeBSD-specific. */
-#define AUE_KQUEUE 43067 /* FreeBSD-specific. */
-#define AUE_KEVENT 43068 /* FreeBSD-specific. */
-#define AUE_FSYNC 43069
-#define AUE_NMOUNT 43070 /* FreeBSD-specific. */
-#define AUE_BDFLUSH 43071 /* Linux-specific. */
-#define AUE_SETFSUID 43072 /* Linux-specific. */
-#define AUE_SETFSGID 43073 /* Linux-specific. */
-#define AUE_PERSONALITY 43074 /* Linux-specific. */
-#define AUE_SCHED_GETSCHEDULER 43075 /* POSIX.1b. */
-#define AUE_SCHED_SETSCHEDULER 43076 /* POSIX.1b. */
-#define AUE_PRCTL 43077 /* Linux-specific. */
-#define AUE_GETCWD 43078 /* FreeBSD/Linux-specific. */
-#define AUE_CAPGET 43079 /* Linux-specific. */
-#define AUE_CAPSET 43080 /* Linux-specific. */
-#define AUE_PIVOT_ROOT 43081 /* Linux-specific. */
-#define AUE_RTPRIO 43082 /* FreeBSD-specific. */
-#define AUE_SCHED_GETPARAM 43083 /* POSIX.1b. */
-#define AUE_SCHED_SETPARAM 43084 /* POSIX.1b. */
-#define AUE_SCHED_GET_PRIORITY_MAX 43085 /* POSIX.1b. */
-#define AUE_SCHED_GET_PRIORITY_MIN 43086 /* POSIX.1b. */
-#define AUE_SCHED_RR_GET_INTERVAL 43087 /* POSIX.1b. */
-#define AUE_ACL_GET_FILE 43088 /* FreeBSD. */
-#define AUE_ACL_SET_FILE 43089 /* FreeBSD. */
-#define AUE_ACL_GET_FD 43090 /* FreeBSD. */
-#define AUE_ACL_SET_FD 43091 /* FreeBSD. */
-#define AUE_ACL_DELETE_FILE 43092 /* FreeBSD. */
-#define AUE_ACL_DELETE_FD 43093 /* FreeBSD. */
-#define AUE_ACL_CHECK_FILE 43094 /* FreeBSD. */
-#define AUE_ACL_CHECK_FD 43095 /* FreeBSD. */
-#define AUE_ACL_GET_LINK 43096 /* FreeBSD. */
-#define AUE_ACL_SET_LINK 43097 /* FreeBSD. */
-#define AUE_ACL_DELETE_LINK 43098 /* FreeBSD. */
-#define AUE_ACL_CHECK_LINK 43099 /* FreeBSD. */
-#define AUE_SYSARCH 43100 /* FreeBSD. */
-#define AUE_EXTATTRCTL 43101 /* FreeBSD. */
-#define AUE_EXTATTR_GET_FILE 43102 /* FreeBSD. */
-#define AUE_EXTATTR_SET_FILE 43103 /* FreeBSD. */
-#define AUE_EXTATTR_LIST_FILE 43104 /* FreeBSD. */
-#define AUE_EXTATTR_DELETE_FILE 43105 /* FreeBSD. */
-#define AUE_EXTATTR_GET_FD 43106 /* FreeBSD. */
-#define AUE_EXTATTR_SET_FD 43107 /* FreeBSD. */
-#define AUE_EXTATTR_LIST_FD 43108 /* FreeBSD. */
-#define AUE_EXTATTR_DELETE_FD 43109 /* FreeBSD. */
-#define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */
-#define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */
-#define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */
-#define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */
-
-/*
- * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
- * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat
- * interface. In most cases, Darwin has never implemented these system calls
- * but picked up the fields in their system call table from their FreeBSD
- * import. Happily, these have different names than the AUE_O* definitions
- * in Solaris BSM.
- */
-#define AUE_O_CREAT AUE_OPEN_RWTC /* Darwin */
-#define AUE_O_EXECVE AUE_NULL /* Darwin */
-#define AUE_O_SBREAK AUE_NULL /* Darwin */
-#define AUE_O_LSEEK AUE_NULL /* Darwin */
-#define AUE_O_MOUNT AUE_NULL /* Darwin */
-#define AUE_O_UMOUNT AUE_NULL /* Darwin */
-#define AUE_O_STAT AUE_STAT /* Darwin */
-#define AUE_O_LSTAT AUE_LSTAT /* Darwin */
-#define AUE_O_FSTAT AUE_FSTAT /* Darwin */
-#define AUE_O_GETPAGESIZE AUE_NULL /* Darwin */
-#define AUE_O_VREAD AUE_NULL /* Darwin */
-#define AUE_O_VWRITE AUE_NULL /* Darwin */
-#define AUE_O_MMAP AUE_MMAP /* Darwin */
-#define AUE_O_VADVISE AUE_NULL /* Darwin */
-#define AUE_O_VHANGUP AUE_NULL /* Darwin */
-#define AUE_O_VLIMIT AUE_NULL /* Darwin */
-#define AUE_O_WAIT AUE_NULL /* Darwin */
-#define AUE_O_GETHOSTNAME AUE_NULL /* Darwin */
-#define AUE_O_SETHOSTNAME AUE_SYSCTL /* Darwin */
-#define AUE_O_GETDOPT AUE_NULL /* Darwin */
-#define AUE_O_SETDOPT AUE_NULL /* Darwin */
-#define AUE_O_ACCEPT AUE_NULL /* Darwin */
-#define AUE_O_SEND AUE_SENDMSG /* Darwin */
-#define AUE_O_RECV AUE_RECVMSG /* Darwin */
-#define AUE_O_VTIMES AUE_NULL /* Darwin */
-#define AUE_O_SIGVEC AUE_NULL /* Darwin */
-#define AUE_O_SIGBLOCK AUE_NULL /* Darwin */
-#define AUE_O_SIGSETMASK AUE_NULL /* Darwin */
-#define AUE_O_SIGSTACK AUE_NULL /* Darwin */
-#define AUE_O_RECVMSG AUE_RECVMSG /* Darwin */
-#define AUE_O_SENDMSG AUE_SENDMSG /* Darwin */
-#define AUE_O_VTRACE AUE_NULL /* Darwin */
-#define AUE_O_RESUBA AUE_NULL /* Darwin */
-#define AUE_O_RECVFROM AUE_RECVFROM /* Darwin */
-#define AUE_O_SETREUID AUE_SETREUID /* Darwin */
-#define AUE_O_SETREGID AUE_SETREGID /* Darwin */
-#define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES /* Darwin */
-#define AUE_O_TRUNCATE AUE_TRUNCATE /* Darwin */
-#define AUE_O_FTRUNCATE AUE_FTRUNCATE /* Darwin */
-#define AUE_O_GETPEERNAME AUE_NULL /* Darwin */
-#define AUE_O_GETHOSTID AUE_NULL /* Darwin */
-#define AUE_O_SETHOSTID AUE_NULL /* Darwin */
-#define AUE_O_GETRLIMIT AUE_NULL /* Darwin */
-#define AUE_O_SETRLIMIT AUE_SETRLIMIT /* Darwin */
-#define AUE_O_KILLPG AUE_KILL /* Darwin */
-#define AUE_O_SETQUOTA AUE_NULL /* Darwin */
-#define AUE_O_QUOTA AUE_NULL /* Darwin */
-#define AUE_O_GETSOCKNAME AUE_NULL /* Darwin */
-#define AUE_O_GETDIREENTRIES AUE_GETDIREENTRIES /* Darwin */
-#define AUE_O_ASYNCDAEMON AUE_NULL /* Darwin */
-#define AUE_O_GETDOMAINNAME AUE_NULL /* Darwin */
-#define AUE_O_SETDOMAINNAME AUE_SYSCTL /* Darwin */
-#define AUE_O_PCFS_MOUNT AUE_NULL /* Darwin */
-#define AUE_O_EXPORTFS AUE_NULL /* Darwin */
-#define AUE_O_USTATE AUE_NULL /* Darwin */
-#define AUE_O_WAIT3 AUE_NULL /* Darwin */
-#define AUE_O_RPAUSE AUE_NULL /* Darwin */
-#define AUE_O_GETDENTS AUE_NULL /* Darwin */
-
-/*
- * Possible desired future values based on review of BSD/Darwin system calls.
- */
-#define AUE_DUP AUE_NULL
-#define AUE_FSCTL AUE_NULL
-#define AUE_FSTATV AUE_NULL
-#define AUE_GCCONTROL AUE_NULL
-#define AUE_GETDTABLESIZE AUE_NULL
-#define AUE_GETEGID AUE_NULL
-#define AUE_GETEUID AUE_NULL
-#define AUE_GETGID AUE_NULL
-#define AUE_GETGROUPS AUE_NULL
-#define AUE_GETITIMER AUE_NULL
-#define AUE_GETLOGIN AUE_NULL
-#define AUE_GETPEERNAME AUE_NULL
-#define AUE_GETPGID AUE_NULL
-#define AUE_GETPGRP AUE_NULL
-#define AUE_GETPID AUE_NULL
-#define AUE_GETPPID AUE_NULL
-#define AUE_GETPRIORITY AUE_NULL
-#define AUE_GETRLIMIT AUE_NULL
-#define AUE_GETRUSAGE AUE_NULL
-#define AUE_GETSID AUE_NULL
-#define AUE_GETSOCKNAME AUE_NULL
-#define AUE_GETTIMEOFDAY AUE_NULL
-#define AUE_GETUID AUE_NULL
-#define AUE_GETSOCKOPT AUE_NULL
-#define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */
-#define AUE_ISSETUGID AUE_NULL
-#define AUE_LISTEN AUE_NULL
-#define AUE_LSTATV AUE_NULL
-#define AUE_MADVISE AUE_NULL
-#define AUE_MINCORE AUE_NULL
-#define AUE_MKCOMPLEX AUE_NULL
-#define AUE_MLOCKALL AUE_NULL
-#define AUE_MODWATCH AUE_NULL
-#define AUE_MSGCL AUE_NULL
-#define AUE_MSYNC AUE_NULL
-#define AUE_MUNLOCKALL AUE_NULL
-#define AUE_PREAD AUE_NULL
-#define AUE_PWRITE AUE_NULL
-#define AUE_PREADV AUE_NULL
-#define AUE_PWRITEV AUE_NULL
-#define AUE_SBRK AUE_NULL
-#define AUE_SELECT AUE_NULL
-#define AUE_SEMDESTROY AUE_NULL
-#define AUE_SEMGETVALUE AUE_NULL
-#define AUE_SEMINIT AUE_NULL
-#define AUE_SEMPOST AUE_NULL
-#define AUE_SEMTRYWAIT AUE_NULL
-#define AUE_SEMWAIT AUE_NULL
-#define AUE_SETITIMER AUE_NULL
-#define AUE_SIGACTION AUE_NULL
-#define AUE_SIGALTSTACK AUE_NULL
-#define AUE_SIGPENDING AUE_NULL
-#define AUE_SIGPROCMASK AUE_NULL
-#define AUE_SIGRETURN AUE_NULL
-#define AUE_SIGSUSPEND AUE_NULL
-#define AUE_SIGWAIT AUE_NULL
-#define AUE_SSTK AUE_NULL
-#define AUE_STATV AUE_NULL
-#define AUE_SYNC AUE_NULL
-#define AUE_SYSCALL AUE_NULL
-#define AUE_TABLE AUE_NULL
-#define AUE_WAITEVENT AUE_NULL
-#define AUE_WATCHEVENT AUE_NULL
-
-#endif /* !_BSM_AUDIT_KEVENTS_H_ */
diff --git a/contrib/openbsm/bsm/audit_record.h b/contrib/openbsm/bsm/audit_record.h
deleted file mode 100644
index 79d13c3..0000000
--- a/contrib/openbsm/bsm/audit_record.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2005 Apple Computer, Inc.
- * All rights reserved.
- *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
- * 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 Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 $
- */
-
-#ifndef _BSM_AUDIT_RECORD_H_
-#define _BSM_AUDIT_RECORD_H_
-
-#include <sys/time.h> /* struct timeval */
-
-/*
- * Token type identifiers.
- */
-#define AUT_INVALID 0x00
-#define AUT_OTHER_FILE32 0x11
-#define AUT_OHEADER 0x12
-#define AUT_TRAILER 0x13
-#define AUT_HEADER32 0x14
-#define AUT_HEADER32_EX 0x15
-#define AUT_DATA 0x21
-#define AUT_IPC 0x22
-#define AUT_PATH 0x23
-#define AUT_SUBJECT32 0x24
-#define AUT_SERVER32 0x25
-#define AUT_PROCESS32 0x26
-#define AUT_RETURN32 0x27
-#define AUT_TEXT 0x28
-#define AUT_OPAQUE 0x29
-#define AUT_IN_ADDR 0x2a
-#define AUT_IP 0x2b
-#define AUT_IPORT 0x2c
-#define AUT_ARG32 0x2d
-#define AUT_SOCKET 0x2e
-#define AUT_SEQ 0x2f
-#define AUT_ACL 0x30
-#define AUT_ATTR 0x31
-#define AUT_IPC_PERM 0x32
-#define AUT_LABEL 0x33
-#define AUT_GROUPS 0x34
-#define AUT_ILABEL 0x35
-#define AUT_SLABEL 0x36
-#define AUT_CLEAR 0x37
-#define AUT_PRIV 0x38
-#define AUT_UPRIV 0x39
-#define AUT_LIAISON 0x3a
-#define AUT_NEWGROUPS 0x3b
-#define AUT_EXEC_ARGS 0x3c
-#define AUT_EXEC_ENV 0x3d
-#define AUT_ATTR32 0x3e
-/* #define AUT_???? 0x3f */
-#define AUT_XATOM 0x40
-#define AUT_XOBJ 0x41
-#define AUT_XPROTO 0x42
-#define AUT_XSELECT 0x43
-/* XXXRW: Additional X11 tokens not defined? */
-#define AUT_CMD 0x51
-#define AUT_EXIT 0x52
-/* XXXRW: OpenBSM AUT_HOST 0x70? */
-#define AUT_ARG64 0x71
-#define AUT_RETURN64 0x72
-#define AUT_ATTR64 0x73
-#define AUT_HEADER64 0x74
-#define AUT_SUBJECT64 0x75
-#define AUT_SERVER64 0x76
-#define AUT_PROCESS64 0x77
-#define AUT_OTHER_FILE64 0x78
-#define AUT_HEADER64_EX 0x79
-#define AUT_SUBJECT32_EX 0x7a
-#define AUT_PROCESS32_EX 0x7b
-#define AUT_SUBJECT64_EX 0x7c
-#define AUT_PROCESS64_EX 0x7d
-#define AUT_IN_ADDR_EX 0x7e
-#define AUT_SOCKET_EX 0x7f
-
-/*
- * Pre-64-bit BSM, 32-bit tokens weren't explicitly named as '32'. We have
- * compatibility defines.
- */
-#define AUT_HEADER AUT_HEADER32
-#define AUT_ARG AUT_ARG32
-#define AUT_RETURN AUT_RETURN32
-#define AUT_SUBJECT AUT_SUBJECT32
-#define AUT_SERVER AUT_SERVER32
-#define AUT_PROCESS AUT_PROCESS32
-#define AUT_OTHER_FILE AUT_OTHER_FILE32
-
-/*
- * Darwin's bsm distribution uses the following non-BSM token name defines.
- * We provide them for a single OpenBSM release for compatibility reasons.
- */
-#define AU_FILE_TOKEN AUT_OTHER_FILE32
-#define AU_TRAILER_TOKEN AUT_TRAILER
-#define AU_HEADER_32_TOKEN AUT_HEADER32
-#define AU_DATA_TOKEN AUT_DATA
-#define AU_ARB_TOKEN AUT_DATA
-#define AU_IPC_TOKEN AUT_IPC
-#define AU_PATH_TOKEN AUT_PATH
-#define AU_SUBJECT_32_TOKEN AUT_SUBJECT32
-#define AU_PROCESS_32_TOKEN AUT_PROCESS32
-#define AU_RETURN_32_TOKEN AUT_RETURN32
-#define AU_TEXT_TOKEN AUT_TEXT
-#define AU_OPAQUE_TOKEN AUT_OPAQUE
-#define AU_IN_ADDR_TOKEN AUT_IN_ADDR
-#define AU_IP_TOKEN AUT_IP
-#define AU_IPORT_TOKEN AUT_IPORT
-#define AU_ARG32_TOKEN AUT_ARG32
-#define AU_SOCK_TOKEN AUT_SOCKET
-#define AU_SEQ_TOKEN AUT_SEQ
-#define AU_ATTR_TOKEN AUT_ATTR
-#define AU_IPCPERM_TOKEN AUT_IPC_PERM
-#define AU_NEWGROUPS_TOKEN AUT_NEWGROUPS
-#define AU_EXEC_ARG_TOKEN AUT_EXEC_ARGS
-#define AU_EXEC_ENV_TOKEN AUT_EXEC_ENV
-#define AU_ATTR32_TOKEN AUT_ATTR32
-#define AU_CMD_TOKEN AUT_CMD
-#define AU_EXIT_TOKEN AUT_EXIT
-#define AU_ARG64_TOKEN AUT_ARG64
-#define AU_RETURN_64_TOKEN AUT_RETURN64
-#define AU_ATTR64_TOKEN AUT_ATTR64
-#define AU_HEADER_64_TOKEN AUT_HEADER64
-#define AU_SUBJECT_64_TOKEN AUT_SUBJECT64
-#define AU_PROCESS_64_TOKEN AUT_PROCESS64
-#define AU_HEADER_64_EX_TOKEN AUT_HEADER64_EX
-#define AU_SUBJECT_32_EX_TOKEN AUT_SUBJECT32_EX
-#define AU_PROCESS_32_EX_TOKEN AUT_PROCESS32_EX
-#define AU_SUBJECT_64_EX_TOKEN AUT_SUBJECT64_EX
-#define AU_PROCESS_64_EX_TOKEN AUT_PROCESS64_EX
-#define AU_IN_ADDR_EX_TOKEN AUT_IN_ADDR_EX
-#define AU_SOCK_32_EX_TOKEN AUT_SOCKET_EX
-
-/*
- * The values for the following token ids are not defined by BSM.
- *
- * XXXRW: Not sure how to handle these in OpenBSM yet, but I'll give them
- * names more consistent with Sun's BSM. These originally came from Apple's
- * BSM.
- */
-#define AUT_SOCKINET32 0x80 /* XXX */
-#define AUT_SOCKINET128 0x81 /* XXX */
-#define AUT_SOCKUNIX 0x82 /* XXX */
-#define AU_SOCK_INET_32_TOKEN AUT_SOCKINET32
-#define AU_SOCK_INET_128_TOKEN AUT_SOCKINET128
-#define AU_SOCK_UNIX_TOKEN AUT_SOCKUNIX
-
-/* print values for the arbitrary token */
-#define AUP_BINARY 0
-#define AUP_OCTAL 1
-#define AUP_DECIMAL 2
-#define AUP_HEX 3
-#define AUP_STRING 4
-
-/* data-types for the arbitrary token */
-#define AUR_BYTE 0
-#define AUR_CHAR AUR_BYTE
-#define AUR_SHORT 1
-#define AUR_INT32 2
-#define AUR_INT AUR_INT32
-#define AUR_INT64 3
-
-/* ... and their sizes */
-#define AUR_BYTE_SIZE sizeof(u_char)
-#define AUR_CHAR_SIZE AUR_BYTE_SIZE
-#define AUR_SHORT_SIZE sizeof(uint16_t)
-#define AUR_INT32_SIZE sizeof(uint32_t)
-#define AUR_INT_SIZE AUR_INT32_SIZE
-#define AUR_INT64_SIZE sizeof(uint64_t)
-
-/* Modifiers for the header token */
-#define PAD_NOTATTR 0x4000 /* nonattributable event */
-#define PAD_FAILURE 0x8000 /* fail audit event */
-
-#define AUDIT_MAX_GROUPS 16
-
-/*
- * A number of BSM versions are floating around and defined. Here are
- * constants for them. OpenBSM uses the same token types, etc, used in the
- * Solaris BSM version, but has a separate version number in order to
- * identify a potentially different event identifier name space.
- */
-#define AUDIT_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */
-#define AUDIT_HEADER_VERSION_SOLARIS 2
-#define AUDIT_HEADER_VERSION_TSOL25 3
-#define AUDIT_HEADER_VERSION_TSOL 4
-#define AUDIT_HEADER_VERSION_OPENBSM 10
-
-/*
- * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we
- * split the difference, will remove the Apple define for the next release.
- */
-#define AUT_TRAILER_MAGIC 0xb105
-#define TRAILER_PAD_MAGIC AUT_TRAILER_MAGIC
-
-/* BSM library calls */
-
-__BEGIN_DECLS
-
-struct in_addr;
-struct in6_addr;
-struct ip;
-struct ipc_perm;
-struct kevent;
-struct sockaddr_in;
-struct sockaddr_in6;
-struct sockaddr_un;
-#if defined(_KERNEL) || defined(KERNEL)
-struct vnode_au_info;
-#endif
-
-int au_open(void);
-int au_write(int d, token_t *m);
-int au_close(int d, int keep, short event);
-int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen);
-int au_close_token(token_t *tok, u_char *buffer, size_t *buflen);
-
-token_t *au_to_file(char *file, struct timeval tm);
-
-token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod,
- struct timeval tm);
-#if !defined(KERNEL) && !defined(_KERNEL)
-token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod);
-token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod);
-token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod);
-#endif
-
-token_t *au_to_me(void);
-token_t *au_to_arg(char n, char *text, uint32_t v);
-token_t *au_to_arg32(char n, char *text, uint32_t v);
-token_t *au_to_arg64(char n, char *text, uint64_t v);
-
-#if defined(_KERNEL) || defined(KERNEL)
-token_t *au_to_attr(struct vnode_au_info *vni);
-token_t *au_to_attr32(struct vnode_au_info *vni);
-token_t *au_to_attr64(struct vnode_au_info *vni);
-#endif
-
-token_t *au_to_data(char unit_print, char unit_type, char unit_count,
- char *p);
-token_t *au_to_exit(int retval, int err);
-token_t *au_to_groups(int *groups);
-token_t *au_to_newgroups(uint16_t n, gid_t *groups);
-token_t *au_to_in_addr(struct in_addr *internet_addr);
-token_t *au_to_in_addr_ex(struct in6_addr *internet_addr);
-token_t *au_to_ip(struct ip *ip);
-token_t *au_to_ipc(char type, int id);
-token_t *au_to_ipc_perm(struct ipc_perm *perm);
-token_t *au_to_iport(uint16_t iport);
-token_t *au_to_opaque(char *data, uint16_t bytes);
-token_t *au_to_path(char *path);
-token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t *au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t *au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid,
- uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid,
- au_tid_addr_t *tid);
-token_t *au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t *au_to_return(char status, uint32_t ret);
-token_t *au_to_return32(char status, uint32_t ret);
-token_t *au_to_return64(char status, uint64_t ret);
-token_t *au_to_seq(long audit_count);
-
-#if defined(_KERNEL) || defined(KERNEL)
-token_t *au_to_socket(struct socket *so);
-token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, struct sockaddr *la,
- struct sockaddr *ta);
-token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, struct sockaddr *la,
- struct sockaddr *ta);
-#endif
-
-token_t *au_to_sock_inet(struct sockaddr_in *so);
-token_t *au_to_sock_inet32(struct sockaddr_in *so);
-token_t *au_to_sock_inet128(struct sockaddr_in6 *so);
-token_t *au_to_sock_unix(struct sockaddr_un *so);
-token_t *au_to_subject(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t *au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t *au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t *au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t *au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
- gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-#if defined(_KERNEL) || defined(KERNEL)
-token_t *au_to_exec_args(char *args, int argc);
-token_t *au_to_exec_env(char *envs, int envc);
-#else
-token_t *au_to_exec_args(char **argv);
-token_t *au_to_exec_env(char **envp);
-#endif
-token_t *au_to_text(char *text);
-token_t *au_to_kevent(struct kevent *kev);
-token_t *au_to_trailer(int rec_size);
-
-__END_DECLS
-
-#endif /* ! _BSM_AUDIT_RECORD_H_ */
diff --git a/contrib/openbsm/config/config.h b/contrib/openbsm/config/config.h
new file mode 100644
index 0000000..42cbf67
--- /dev/null
+++ b/contrib/openbsm/config/config.h
@@ -0,0 +1,192 @@
+/* config/config.h. Generated by configure. */
+/* config/config.h.in. Generated from configure.ac by autoheader. */
+/* $FreeBSD$
+
+/* Define to 1 if you have the `alarm' function. */
+#define HAVE_ALARM 1
+
+/* Define if audit system calls present */
+#define HAVE_AUDIT_SYSCALLS
+
+/* Define to 1 if you have the `bzero' function. */
+#define HAVE_BZERO 1
+
+/* Define to 1 if your system has a working `chown' function. */
+#define HAVE_CHOWN 1
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#define HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <endian.h> header file. */
+/* #undef HAVE_ENDIAN_H */
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE 1
+
+/* Define if queue.h includes LIST_FIRST */
+#define HAVE_FULL_QUEUE_H
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `inet_ntoa' function. */
+#define HAVE_INET_NTOA 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if ipc_perm.__key instead of key */
+/* #undef HAVE_IPC_PERM___KEY */
+
+/* Define if ipc_perm.__seq instead of seq */
+/* #undef HAVE_IPC_PERM___SEQ */
+
+/* Define to 1 if you have the <machine/endian.h> header file. */
+#define HAVE_MACHINE_ENDIAN_H 1
+
+/* Define to 1 if you have the <mach/mach.h> header file. */
+/* #undef HAVE_MACH_MACH_H */
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+ to 0 otherwise. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+ zero-length file name argument. */
+/* #undef HAVE_STAT_EMPTY_STRING_BUG */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strrchr' function. */
+#define HAVE_STRRCHR 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if `st_rdev' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+
+/* Define to 1 if you have the <sys/endian.h> header file. */
+#define HAVE_SYS_ENDIAN_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+ slash. */
+/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
+
+/* Name of package */
+#define PACKAGE "OpenBSM"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "trustedbsd-audit@TrustesdBSD.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.0a9"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "openbsm"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.0a9"
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Version number of package */
+#define VERSION "1.0a9"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class
index 3a7da08..f65ae41 100644
--- a/contrib/openbsm/etc/audit_class
+++ b/contrib/openbsm/etc/audit_class
@@ -1,5 +1,6 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#4 $
+# $FreeBSD$
#
# This file must match audit.h
#
diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control
index fb1ce1a..7e60cbc 100644
--- a/contrib/openbsm/etc/audit_control
+++ b/contrib/openbsm/etc/audit_control
@@ -1,5 +1,6 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#3 $
+# $FreeBSD$
#
dir:/var/audit
flags:lo
diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event
index ebab4ed..8983ce4 100644
--- a/contrib/openbsm/etc/audit_event
+++ b/contrib/openbsm/etc/audit_event
@@ -1,5 +1,6 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#12 $
+# $FreeBSD$
#
0:AUE_NULL:indir system call:no
1:AUE_EXIT:exit(2):pc
diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user
index 7b92f06..0cce4f1 100644
--- a/contrib/openbsm/etc/audit_user
+++ b/contrib/openbsm/etc/audit_user
@@ -1,4 +1,5 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#3 $
+# $FreeBSD$
#
root:lo:no
diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn
index 3612fc9..c5a3159 100644
--- a/contrib/openbsm/etc/audit_warn
+++ b/contrib/openbsm/etc/audit_warn
@@ -1,5 +1,6 @@
#!/bin/sh
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $
+# $FreeBSD$
#
logger -p security.warning "audit warning: $@"
diff --git a/contrib/openbsm/libbsm/Makefile b/contrib/openbsm/libbsm/Makefile
deleted file mode 100644
index 00534aa..0000000
--- a/contrib/openbsm/libbsm/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# OpenBSM libbsm
-#
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#13 $
-#
-
-LIB= bsm
-SHLIB_MAJOR= 1
-
-CFLAGS+=-I- \
- -I .. \
- -Wall
-
-SRCS= bsm_audit.c \
- bsm_class.c \
- bsm_control.c \
- bsm_event.c \
- bsm_flags.c \
- bsm_io.c \
- bsm_mask.c \
- bsm_notify.c \
- bsm_token.c \
- bsm_user.c \
- bsm_wrappers.c
-
-MAN= libbsm.3 \
- au_class.3 \
- au_control.3 \
- au_event.3 \
- au_free_token.3 \
- au_io.3 \
- au_mask.3 \
- au_token.3 \
- au_user.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 \
- au_control.3 endac.3 \
- au_control.3 getacdir.3 \
- au_control.3 getacmin.3 \
- au_control.3 getacflg.3 \
- au_control.3 getacna.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 \
- au_mask.3 au_preselect.3 \
- au_mask.3 getauditflagsbin.3 \
- au_mask.3 getauditflagschar.3 \
- au_user.3 setauuser.3 \
- au_user.3 endauuser.3 \
- au_user.3 getauuserent.3 \
- au_user.3 getauusernam.3 \
- au_user.3 au_user_mask.3 \
- au_user.3 getfauditflags.3 \
- au_token.3 au_to_arg32.3 \
- au_token.3 au_to_arg64.3 \
- au_token.3 au_to_arg.3 \
- au_token.3 au_to_attr64.3 \
- au_token.3 au_to_data.3 \
- au_token.3 au_to_exit.3 \
- au_token.3 au_to_groups.3 \
- au_token.3 au_to_newgroups.3 \
- au_token.3 au_to_in_addr.3 \
- au_token.3 au_to_in_addr_ex.3 \
- au_token.3 au_to_ip.3 \
- au_token.3 au_to_ipc.3 \
- au_token.3 au_to_ipc_perm.3 \
- au_token.3 au_to_iport.3 \
- au_token.3 au_to_opaque.3 \
- au_token.3 au_to_file.3 \
- au_token.3 au_to_text.3 \
- au_token.3 au_to_path.3 \
- au_token.3 au_to_process32.3 \
- au_token.3 au_to_process64.3 \
- au_token.3 au_to_process.3 \
- au_token.3 au_to_process32_ex.3 \
- au_token.3 au_to_process64_ex.3 \
- au_token.3 au_to_process_ex.3 \
- au_token.3 au_to_return32.3 \
- au_token.3 au_to_return64.3 \
- au_token.3 au_to_return.3 \
- au_token.3 au_to_seq.3 \
- au_token.3 au_to_socket.3 \
- au_token.3 au_to_socket_ex_32.3 \
- au_token.3 au_to_socket_ex_128.3 \
- au_token.3 au_to_sock_inet32.3 \
- au_token.3 au_to_sock_inet128.3 \
- au_token.3 au_to_sock_inet.3 \
- au_token.3 au_to_subject32.3 \
- au_token.3 au_to_subject64.3 \
- au_token.3 au_to_subject.3 \
- au_token.3 au_to_subject32_ex.3 \
- au_token.3 au_to_subject64_ex.3 \
- au_token.3 au_to_subject_ex.3 \
- au_token.3 au_to_me.3 \
- au_token.3 au_to_exec_args.3 \
- au_token.3 au_to_exec_env.3 \
- au_token.3 au_to_header.3 \
- au_token.3 au_to_header32.3 \
- au_token.3 au_to_header64.3 \
- au_token.3 au_to_trailer.3
-
-beforeinstall:
- if test -d ${INCSDIR}; then \
- else \
- mkdir ${INCSDIR}; \
- fi;
-
-.include <bsd.lib.mk>
diff --git a/contrib/openbsm/man/Makefile b/contrib/openbsm/man/Makefile
deleted file mode 100644
index 1fbbc31..0000000
--- a/contrib/openbsm/man/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#7 $
-#
-
-MAN= audit.2 \
- auditctl.2 \
- auditon.2 \
- getaudit.2 \
- getauid.2 \
- setaudit.2 \
- setauid.2 \
- audit.log.5 \
- audit_class.5 \
- audit_control.5 \
- audit_event.5 \
- audit_user.5 \
- audit_warn.5
-
-MLINKS= getaudit.2 getaudit_addr.2 \
- setaudit.2 setaudit_addr.2
-
-.include <bsd.prog.mk>
diff --git a/contrib/openbsm/tools/Makefile b/contrib/openbsm/tools/Makefile
deleted file mode 100644
index 79e582d..0000000
--- a/contrib/openbsm/tools/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile#3 $
-#
-
-CFLAGS+= -I- -I .. -I ../libbsm -L ../libbsm -I.
-PROG= audump
-NO_MAN=
-DPADD= /usr/lib/libbsm.a
-LDADD= -lbsm
-BINDIR= /usr/sbin
-WARNS= 3
-
-.include <bsd.prog.mk>
OpenPOWER on IntegriCloud