From owner-freebsd-current@FreeBSD.ORG Thu Sep 21 07:38:13 2006 Return-Path: X-Original-To: current@FreeBSD.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA91416A403 for ; Thu, 21 Sep 2006 07:38:13 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A7D743D49 for ; Thu, 21 Sep 2006 07:38:13 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 04A3246D93 for ; Thu, 21 Sep 2006 03:38:13 -0400 (EDT) Date: Thu, 21 Sep 2006 08:38:12 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: current@FreeBSD.org Message-ID: <20060921083623.G55647@fledge.watson.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Subject: OpenBSM 1.0 alpha 11 merge to CVS HEAD X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 07:38:13 -0000 I've just finished the import of OpenBSM 1.0 alpha 11 to HEAD; I'm currently running build tests, it's possible there are nits which I will (of course) resolve as soon as my build tests finish. I realized that I didn't actually import 1.0a10, which has the following very short change history: - auditd now generates complete audit records for its events, as required for application-submitted audit records in the the FreeBSD kernel audit implementation. Complete history for alpha 11 attached below; largely this is based on feedback from testers in -CURRENT and -STABLE in the last month, which is greatly appreciated. This is an MFC candidate, since it fixes some important bugs, and also allows setting of audit policy (such as the argv/arge policy flags). Robert N M Watson Computer Laboratory University of Cambridge ---------- Forwarded message ---------- Date: Thu, 21 Sep 2006 07:07:35 +0000 (UTC) From: Robert Watson To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/openbsm - Imported sources rwatson 2006-09-21 07:07:35 UTC FreeBSD src repository src/contrib/openbsm - Imported sources Update of /home/ncvs/src/contrib/openbsm In directory repoman.freebsd.org:/tmp/cvs-serv47564 Log Message: Vendor import of OpenBSM 1.0 alpha 11, with the following change history notes since the last import: OpenBSM 1.0 alpha 11 - Reclassify certain read/write operations as having no class rather than the fr/fw class; our default classes audit intent (open) not operations (read, write). - Introduce AUE_SYSCTL_WRITE event so that BSD/Darwin systems can audit reads and writes of sysctls as separate events. Add additional kernel environment and jail events for FreeBSD. - Break AUDIT_TRIGGER_OPEN_NEW into two events, AUDIT_TRIGGER_ROTATE_USER (issued by the user audit(8) tool) and AUDIT_TRIGGER_ROTATE_KERNEL (issued by the kernel audit implementation) so that they can be distinguished. - Disable rate limiting of rotate requests; as the kernel doesn't retransmit a dropped request, the log file will otherwise grow indefinitely if the trigger is dropped. - Improve auditd debugging output. - Fix a number of threading related bugs in audit_control file reading routines. - Add APIs au_poltostr() and au_strtopol() to convert between text representations of audit_control policy flags and the flags passed to auditon(A_SETPOLICY) and retrieved from auditon(A_GETPOLICY). - Add API getacpol() to return the 'policy:' entry from audit_control, an extension to the Solaris file format to allow specification of policy persistent flags. - Update audump to print the audit_control policy field. - Update auditd to read the audit_control policy field and set the kernel policy to match it when configuring/reconfiguring. Remove the -s and -h arguments as these policies are now set via the configuration file. If a policy line is not found in the configuration file, continue with the current default of setting AUDIT_CNT. - Fix bugs in the parsing of large execve(2) arguments and environmental variable tokens; increase maximum parsed argument and variable count. - configure now detects strlcat(), used by policy-related functions. - Reference token and record sample files added to test tree. Obtained from: TrustedBSD Project Status: Vendor Tag: TrustedBSD Release Tags: OPENBSM_1_0_ALPHA_11 U src/contrib/openbsm/HISTORY U src/contrib/openbsm/LICENSE U src/contrib/openbsm/Makefile.am U src/contrib/openbsm/Makefile.in U src/contrib/openbsm/README U src/contrib/openbsm/TODO U src/contrib/openbsm/VERSION U src/contrib/openbsm/aclocal.m4 U src/contrib/openbsm/autogen.sh U src/contrib/openbsm/configure U src/contrib/openbsm/configure.ac U src/contrib/openbsm/bin/Makefile.am U src/contrib/openbsm/bin/Makefile.in U src/contrib/openbsm/bin/audit/Makefile.am U src/contrib/openbsm/bin/audit/Makefile.in U src/contrib/openbsm/bin/audit/audit.8 U src/contrib/openbsm/bin/audit/audit.c U src/contrib/openbsm/bin/auditd/Makefile.am U src/contrib/openbsm/bin/auditd/Makefile.in U src/contrib/openbsm/bin/auditd/audit_warn.c U src/contrib/openbsm/bin/auditd/auditd.8 U src/contrib/openbsm/bin/auditd/auditd.c U src/contrib/openbsm/bin/auditd/auditd.h U src/contrib/openbsm/bin/auditfilterd/Makefile.am U src/contrib/openbsm/bin/auditfilterd/Makefile.in U src/contrib/openbsm/bin/auditfilterd/auditfilterd.8 U src/contrib/openbsm/bin/auditfilterd/auditfilterd.c U src/contrib/openbsm/bin/auditfilterd/auditfilterd.h U src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c U src/contrib/openbsm/bin/auditreduce/Makefile.am U src/contrib/openbsm/bin/auditreduce/Makefile.in U src/contrib/openbsm/bin/auditreduce/auditreduce.1 U src/contrib/openbsm/bin/auditreduce/auditreduce.c U src/contrib/openbsm/bin/auditreduce/auditreduce.h U src/contrib/openbsm/bin/praudit/Makefile.am U src/contrib/openbsm/bin/praudit/Makefile.in U src/contrib/openbsm/bin/praudit/praudit.1 U src/contrib/openbsm/bin/praudit/praudit.c U src/contrib/openbsm/bsm/Makefile.am U src/contrib/openbsm/bsm/Makefile.in C src/contrib/openbsm/bsm/audit.h U src/contrib/openbsm/bsm/audit_filter.h U src/contrib/openbsm/bsm/audit_internal.h C src/contrib/openbsm/bsm/audit_kevents.h U src/contrib/openbsm/bsm/audit_record.h U src/contrib/openbsm/bsm/audit_uevents.h U src/contrib/openbsm/bsm/libbsm.h U src/contrib/openbsm/compat/endian.h U src/contrib/openbsm/compat/queue.h N src/contrib/openbsm/compat/strlcat.h U src/contrib/openbsm/config/config.guess U src/contrib/openbsm/config/config.h.in U src/contrib/openbsm/config/config.sub U src/contrib/openbsm/config/depcomp U src/contrib/openbsm/config/install-sh U src/contrib/openbsm/config/ltmain.sh U src/contrib/openbsm/config/missing U src/contrib/openbsm/etc/audit_class C src/contrib/openbsm/etc/audit_control C src/contrib/openbsm/etc/audit_event U src/contrib/openbsm/etc/audit_filter U src/contrib/openbsm/etc/audit_user U src/contrib/openbsm/etc/audit_warn U src/contrib/openbsm/libbsm/Makefile.am U src/contrib/openbsm/libbsm/Makefile.in U src/contrib/openbsm/libbsm/au_class.3 U src/contrib/openbsm/libbsm/au_control.3 U src/contrib/openbsm/libbsm/au_event.3 U src/contrib/openbsm/libbsm/au_free_token.3 U src/contrib/openbsm/libbsm/au_io.3 U src/contrib/openbsm/libbsm/au_mask.3 U src/contrib/openbsm/libbsm/au_open.3 U src/contrib/openbsm/libbsm/au_token.3 U src/contrib/openbsm/libbsm/au_user.3 U src/contrib/openbsm/libbsm/audit_submit.3 U src/contrib/openbsm/libbsm/bsm_audit.c U src/contrib/openbsm/libbsm/bsm_class.c U src/contrib/openbsm/libbsm/bsm_control.c U src/contrib/openbsm/libbsm/bsm_event.c U src/contrib/openbsm/libbsm/bsm_flags.c U src/contrib/openbsm/libbsm/bsm_io.c U src/contrib/openbsm/libbsm/bsm_mask.c U src/contrib/openbsm/libbsm/bsm_notify.c U src/contrib/openbsm/libbsm/bsm_token.c U src/contrib/openbsm/libbsm/bsm_user.c U src/contrib/openbsm/libbsm/libbsm.3 U src/contrib/openbsm/libbsm/bsm_wrappers.c U src/contrib/openbsm/man/Makefile.am U src/contrib/openbsm/man/Makefile.in U src/contrib/openbsm/man/audit.2 U src/contrib/openbsm/man/audit.log.5 U src/contrib/openbsm/man/audit_class.5 U src/contrib/openbsm/man/audit_control.5 U src/contrib/openbsm/man/audit_event.5 U src/contrib/openbsm/man/audit_user.5 U src/contrib/openbsm/man/audit_warn.5 U src/contrib/openbsm/man/auditctl.2 U src/contrib/openbsm/man/auditon.2 U src/contrib/openbsm/man/getaudit.2 U src/contrib/openbsm/man/getauid.2 U src/contrib/openbsm/man/setaudit.2 U src/contrib/openbsm/man/setauid.2 U src/contrib/openbsm/modules/Makefile.am U src/contrib/openbsm/modules/Makefile.in U src/contrib/openbsm/modules/auditfilter_noop/Makefile.am U src/contrib/openbsm/modules/auditfilter_noop/Makefile.in U src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c U src/contrib/openbsm/test/Makefile.am U src/contrib/openbsm/test/Makefile.in U src/contrib/openbsm/test/bsm/Makefile.am U src/contrib/openbsm/test/bsm/Makefile.in U src/contrib/openbsm/test/bsm/generate.c N src/contrib/openbsm/test/reference/arg32_record N src/contrib/openbsm/test/reference/arg32_token N src/contrib/openbsm/test/reference/data_record N src/contrib/openbsm/test/reference/data_token N src/contrib/openbsm/test/reference/file_record N src/contrib/openbsm/test/reference/file_token N src/contrib/openbsm/test/reference/header32_token N src/contrib/openbsm/test/reference/in_addr_record N src/contrib/openbsm/test/reference/in_addr_token N src/contrib/openbsm/test/reference/ip_record N src/contrib/openbsm/test/reference/ip_token N src/contrib/openbsm/test/reference/ipc_record N src/contrib/openbsm/test/reference/ipc_token N src/contrib/openbsm/test/reference/iport_record N src/contrib/openbsm/test/reference/iport_token N src/contrib/openbsm/test/reference/opaque_record N src/contrib/openbsm/test/reference/opaque_token N src/contrib/openbsm/test/reference/path_record N src/contrib/openbsm/test/reference/path_token N src/contrib/openbsm/test/reference/process32_record N src/contrib/openbsm/test/reference/process32_token N src/contrib/openbsm/test/reference/process32ex_record N src/contrib/openbsm/test/reference/process32ex_token N src/contrib/openbsm/test/reference/return32_record N src/contrib/openbsm/test/reference/return32_token N src/contrib/openbsm/test/reference/seq_record N src/contrib/openbsm/test/reference/seq_token N src/contrib/openbsm/test/reference/subject32_record N src/contrib/openbsm/test/reference/subject32_token N src/contrib/openbsm/test/reference/subject32ex_record N src/contrib/openbsm/test/reference/subject32ex_token-IPv4 N src/contrib/openbsm/test/reference/subject32ex_token-IPv6 N src/contrib/openbsm/test/reference/text_record N src/contrib/openbsm/test/reference/text_token N src/contrib/openbsm/test/reference/trailer_token N src/contrib/openbsm/test/samples/execve-long-args.trail U src/contrib/openbsm/tools/Makefile.am U src/contrib/openbsm/tools/Makefile.in U src/contrib/openbsm/tools/audump.c 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTrustedBSD:yesterday -jTrustedBSD src/contrib/openbsm