]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Merge OpenBSM 1.1 alpha 2 from the OpenBSM vendor branch to head, both
authorRobert Watson <rwatson@FreeBSD.org>
Tue, 2 Dec 2008 23:26:43 +0000 (23:26 +0000)
committerRobert Watson <rwatson@FreeBSD.org>
Tue, 2 Dec 2008 23:26:43 +0000 (23:26 +0000)
commit52267f7411adcc76ede961420e08c0e42f42d415
tree909e4490f5c6d4141d466ad2fdf963beeb90afca
parent23c30ae8754294d1d17b16866ed09f282cda357d
parenta5c6cfa00d9aad0a0da65a940ac6d782edfa841e
Merge OpenBSM 1.1 alpha 2 from the OpenBSM vendor branch to head, both
contrib/openbsm (svn merge) and sys/{bsm,security/audit} (manual merge).

- Add OpenBSM contrib tree to include paths for audit(8) and auditd(8).
- Merge support for new tokens, fixes to existing token generation to
  audit_bsm_token.c.
- Synchronize bsm includes and definitions.

OpenBSM history for imported revisions below for reference.

MFC after:      1 month
Sponsored by:   Apple Inc.
Obtained from:  TrustedBSD Project

--

OpenBSM 1.1 alpha 2

- Include files in OpenBSM are now broken out into two parts: library builds
  required solely for user space, and system includes, which may also be
  required for use in the kernels of systems integrating OpenBSM.  Submitted
  by Stacey Son.
- Configure option --with-native-includes allows forcing the use of native
  include for system includes, rather than the versions bundled with OpenBSM.
  This is intended specifically for platforms that ship OpenBSM, have adapted
  versions of the system includes in a kernel source tree, and will use the
  OpenBSM build infrastructure with an unmodified OpenBSM distribution,
  allowing the customized system includes to be used with the OpenBSM build.
  Submitted by Stacey Son.
- Various strcpy()'s/strcat()'s have been changed to strlcpy()'s/strlcat()'s
  or asprintf().  Added compat/strlcpy.h for Linux.
- Remove compatibility defines for old Darwin token constant names; now only
  BSM token names are provided and used.
- Add support for extended header tokens, which contain space for information
  on the host generating the record.
- Add support for setting extended host information in the kernel, which is
  used for setting host information in extended header tokens.  The
  audit_control file now supports a "host" parameter which can be used by
  auditd to set the information; if not present, the kernel parameters won't
  be set and auditd uses unextended headers for records that it generates.

OpenBSM 1.1 alpha 1

- Add option to auditreduce(1) which allows users to invert sense of
  matching, such that BSM records that do not match, are selected.
- Fix bug in audit_write() where we commit an incomplete record in the
  event there is an error writing the subject token.  This was submitted
  by Diego Giagio.
- Build support for Mac OS X 10.5.1 submitted by Eric Hall.
- Fix a bug which resulted in host XML attributes not being arguments so
  that const strings can be passed as arguments to tokens.  This patch was
  submitted by Xin LI.
- Modify the -m option so users can select more then one audit event.
- For Mac OS X, added Mach IPC support for audit trigger messages.
- Fixed a bug in getacna() which resulted in a locking problem on Mac OS X.
- Added LOG_PERROR flag to openlog when -d option is used with auditd.
- AUE events added for Mac OS X Leopard system calls.
102 files changed:
contrib/openbsm/CREDITS
contrib/openbsm/INSTALL
contrib/openbsm/LICENSE
contrib/openbsm/Makefile.am
contrib/openbsm/Makefile.in
contrib/openbsm/NEWS
contrib/openbsm/README
contrib/openbsm/TODO
contrib/openbsm/VERSION
contrib/openbsm/bin/Makefile.in
contrib/openbsm/bin/audit/Makefile.am
contrib/openbsm/bin/audit/Makefile.in
contrib/openbsm/bin/audit/audit.8
contrib/openbsm/bin/audit/audit.c
contrib/openbsm/bin/auditd/Makefile.am
contrib/openbsm/bin/auditd/Makefile.in
contrib/openbsm/bin/auditd/audit_triggers.defs
contrib/openbsm/bin/auditd/audit_warn.c
contrib/openbsm/bin/auditd/auditd.8
contrib/openbsm/bin/auditd/auditd.c
contrib/openbsm/bin/auditd/auditd.h
contrib/openbsm/bin/auditd/auditd_control.defs
contrib/openbsm/bin/auditfilterd/Makefile.am
contrib/openbsm/bin/auditfilterd/Makefile.in
contrib/openbsm/bin/auditfilterd/auditfilterd.c
contrib/openbsm/bin/auditreduce/Makefile.am
contrib/openbsm/bin/auditreduce/Makefile.in
contrib/openbsm/bin/auditreduce/auditreduce.1
contrib/openbsm/bin/auditreduce/auditreduce.c
contrib/openbsm/bin/auditreduce/auditreduce.h
contrib/openbsm/bin/praudit/Makefile.am
contrib/openbsm/bin/praudit/Makefile.in
contrib/openbsm/bin/praudit/praudit.1
contrib/openbsm/bin/praudit/praudit.c
contrib/openbsm/bsm/Makefile.am
contrib/openbsm/bsm/Makefile.in
contrib/openbsm/bsm/audit_uevents.h
contrib/openbsm/bsm/libbsm.h
contrib/openbsm/compat/clock_gettime.h
contrib/openbsm/compat/strlcat.h
contrib/openbsm/compat/strlcpy.h
contrib/openbsm/config/config.h
contrib/openbsm/config/config.h.in
contrib/openbsm/configure
contrib/openbsm/configure.ac
contrib/openbsm/etc/audit_event
contrib/openbsm/libbsm/Makefile.am
contrib/openbsm/libbsm/Makefile.in
contrib/openbsm/libbsm/au_class.3
contrib/openbsm/libbsm/au_free_token.3
contrib/openbsm/libbsm/au_token.3
contrib/openbsm/libbsm/audit_submit.3
contrib/openbsm/libbsm/bsm_audit.c
contrib/openbsm/libbsm/bsm_class.c
contrib/openbsm/libbsm/bsm_control.c
contrib/openbsm/libbsm/bsm_event.c
contrib/openbsm/libbsm/bsm_flags.c
contrib/openbsm/libbsm/bsm_io.c
contrib/openbsm/libbsm/bsm_mask.c
contrib/openbsm/libbsm/bsm_notify.c
contrib/openbsm/libbsm/bsm_token.c
contrib/openbsm/libbsm/bsm_user.c
contrib/openbsm/libbsm/bsm_wrappers.c
contrib/openbsm/man/Makefile.in
contrib/openbsm/man/audit.2
contrib/openbsm/man/audit.log.5
contrib/openbsm/man/audit_class.5
contrib/openbsm/man/audit_control.5
contrib/openbsm/man/audit_event.5
contrib/openbsm/man/audit_user.5
contrib/openbsm/man/audit_warn.5
contrib/openbsm/man/auditctl.2
contrib/openbsm/man/auditon.2
contrib/openbsm/man/getaudit.2
contrib/openbsm/man/getauid.2
contrib/openbsm/man/setaudit.2
contrib/openbsm/man/setauid.2
contrib/openbsm/modules/Makefile.in
contrib/openbsm/modules/auditfilter_noop/Makefile.am
contrib/openbsm/modules/auditfilter_noop/Makefile.in
contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
contrib/openbsm/sys/Makefile.am
contrib/openbsm/sys/Makefile.in
contrib/openbsm/sys/bsm/Makefile.am
contrib/openbsm/sys/bsm/Makefile.in
contrib/openbsm/sys/bsm/audit.h
contrib/openbsm/sys/bsm/audit_internal.h
contrib/openbsm/sys/bsm/audit_kevents.h
contrib/openbsm/sys/bsm/audit_record.h
contrib/openbsm/test/Makefile.am
contrib/openbsm/test/Makefile.in
contrib/openbsm/test/bsm/Makefile.am
contrib/openbsm/test/bsm/Makefile.in
contrib/openbsm/tools/Makefile.am
contrib/openbsm/tools/Makefile.in
sys/bsm/audit.h
sys/bsm/audit_internal.h
sys/bsm/audit_kevents.h
sys/bsm/audit_record.h
sys/security/audit/audit_bsm_token.c
usr.sbin/audit/Makefile
usr.sbin/auditd/Makefile