Date: Mon, 23 Jul 2007 14:59:52 GMT From: Xin LI <delphij@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 123968 for review Message-ID: <200707231459.l6NExqjW075018@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=123968 Change 123968 by delphij@charlie on 2007/07/23 14:58:59 IFC Affected files ... .. //depot/projects/delphij_fork/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/README#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/VERSION#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/configure#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/delphij_fork/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/delphij_fork/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/delphij_fork/lib/ncurses/config.mk#2 integrate .. //depot/projects/delphij_fork/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/delphij_fork/share/examples/kld/syscall/module/syscall.c#2 integrate .. //depot/projects/delphij_fork/share/man/man5/src.conf.5#2 integrate .. //depot/projects/delphij_fork/share/man/man9/contigmalloc.9#2 integrate .. //depot/projects/delphij_fork/share/mk/version_gen.awk#2 integrate .. //depot/projects/delphij_fork/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/delphij_fork/sys/bsm/audit.h#2 integrate .. //depot/projects/delphij_fork/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/delphij_fork/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/delphij_fork/sys/bsm/audit_record.h#2 integrate .. //depot/projects/delphij_fork/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/NOTES#6 integrate .. //depot/projects/delphij_fork/sys/conf/files#5 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/eth_z8e.dat.gz.uu#3 delete .. //depot/projects/delphij_fork/sys/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/delphij_fork/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 delete .. //depot/projects/delphij_fork/sys/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/delphij_fork/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/delphij_fork/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/delphij_fork/sys/i386/isa/clock.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/sched_ule.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/subr_clock.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/tty.c#2 integrate .. //depot/projects/delphij_fork/sys/modules/Makefile#3 integrate .. //depot/projects/delphij_fork/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_output.c#4 delete .. //depot/projects/delphij_fork/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_var.h#3 integrate .. //depot/projects/delphij_fork/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/delphij_fork/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/delphij_fork/sys/sys/proc.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/rwlock.h#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_fault.c#4 integrate .. //depot/projects/delphij_fork/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/environ/envtest.t#2 integrate .. //depot/projects/delphij_fork/tools/regression/environ/timings.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/locate/locate/locate.rc#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/getdate.y#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/read.c#2 integrate Differences ... ==== //depot/projects/delphij_fork/contrib/openbsm/HISTORY#2 (text) ==== @@ -1,3 +1,14 @@ +OpenBSM 1.0 alpha 15 + +- Fix bug when processing in_addr_ex tokens. +- Restore the behavior of printing the string/text specified while + auditing arg32 tokens. +- Synchronized audit event list to Solaris, picking up the *at(2) system call + definitions, now required for FreeBSD and Linux. Added additional events + for *at(2) system calls not present in Solaris. +- Bugs in auditreduce(8) fixed allowing partial date strings to be used in + filtering events. + OpenBSM 1.0 alpha 14 - Fix endian issues when processing IPv6 addresses for extended subject @@ -284,4 +295,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#50 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#55 $ ==== //depot/projects/delphij_fork/contrib/openbsm/README#2 (text) ==== @@ -89,6 +89,7 @@ Ruslan Ermilov Martin Voros Diego Giagio + Alex Samorukov In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -110,4 +111,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#23 $ +$P4: //depot/projects/trustedbsd/openbsm/README#24 $ ==== //depot/projects/delphij_fork/contrib/openbsm/VERSION#2 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_14 +OPENBSM_1_0_ALPHA_15 ==== //depot/projects/delphij_fork/contrib/openbsm/bin/audit/audit.8#2 (text) ==== @@ -1,8 +1,6 @@ .\" Copyright (c) 2004 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: @@ -27,9 +25,7 @@ .\" (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/bin/audit/audit.8#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#10 $ .\" .Dd October 2, 2006 .Dt AUDIT 8 ==== //depot/projects/delphij_fork/contrib/openbsm/bin/audit/audit.c#2 (text) ==== @@ -2,8 +2,6 @@ * 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: @@ -28,9 +26,7 @@ * (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/bin/audit/audit.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#8 $ */ /* * Program to trigger the audit daemon with a message that is either: ==== //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/audit_warn.c#2 (text) ==== @@ -2,8 +2,6 @@ * 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: @@ -28,9 +26,7 @@ * (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/bin/auditd/audit_warn.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#8 $ */ #include <sys/types.h> ==== //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/auditd.8#2 (text) ==== @@ -1,8 +1,6 @@ .\" Copyright (c) 2004 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: @@ -27,9 +25,7 @@ .\" (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/bin/auditd/auditd.8#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#13 $ .\" .Dd October 2, 2006 .Dt AUDITD 8 ==== //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/auditd.c#2 (text) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2004 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: @@ -28,9 +26,7 @@ * (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/bin/auditd/auditd.c#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#26 $ */ #include <sys/types.h> ==== //depot/projects/delphij_fork/contrib/openbsm/bin/auditd/auditd.h#2 (text) ==== @@ -2,8 +2,6 @@ * 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: @@ -28,9 +26,7 @@ * (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/bin/auditd/auditd.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#8 $ */ #ifndef _AUDITD_H_ ==== //depot/projects/delphij_fork/contrib/openbsm/bin/auditreduce/auditreduce.c#2 (text) ==== @@ -26,7 +26,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/bin/auditreduce/auditreduce.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#19 $ */ /* @@ -629,6 +629,7 @@ usage("d is exclusive with a and b"); } SETOPT(opttochk, OPT_a); + bzero(&tm, sizeof(tm)); strptime(optarg, "%Y%m%d%H%M%S", &tm); strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); @@ -641,6 +642,7 @@ usage("d is exclusive with a and b"); } SETOPT(opttochk, OPT_b); + bzero(&tm, sizeof(tm)); strptime(optarg, "%Y%m%d%H%M%S", &tm); strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); @@ -661,6 +663,7 @@ OPT_a)) usage("'d' is exclusive with 'a' and 'b'"); SETOPT(opttochk, OPT_d); + bzero(&tm, sizeof(tm)); strptime(optarg, "%Y%m%d", &tm); strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); /* fprintf(stderr, "Time converted = %s\n", timestr); */ ==== //depot/projects/delphij_fork/contrib/openbsm/config/config.h#2 (text) ==== @@ -1,6 +1,6 @@ /* config/config.h. Generated by configure. */ /* config/config.h.in. Generated from configure.ac by autoheader. */ -/* $FreeBSD: src/contrib/openbsm/config/config.h,v 1.5 2007/04/16 15:49:15 rwatson Exp $ */ +/* $FreeBSD: src/contrib/openbsm/config/config.h,v 1.6 2007/07/22 12:22:25 rwatson Exp $ */ /* Define to 1 if you have the `alarm' function. */ #define HAVE_ALARM 1 @@ -150,13 +150,13 @@ #define PACKAGE_NAME "OpenBSM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "OpenBSM 1.0alpha14" +#define PACKAGE_STRING "OpenBSM 1.0alpha15" /* 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.0alpha14" +#define PACKAGE_VERSION "1.0alpha15" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -171,7 +171,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "1.0alpha14" +#define VERSION "1.0alpha15" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ ==== //depot/projects/delphij_fork/contrib/openbsm/configure#2 (text) ==== @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#33 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0alpha14. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0alpha15. # # Report bugs to <trustedbsd-audit@TrustesdBSD.org>. # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0alpha14' -PACKAGE_STRING='OpenBSM 1.0alpha14' +PACKAGE_VERSION='1.0alpha15' +PACKAGE_STRING='OpenBSM 1.0alpha15' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0alpha14 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0alpha15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0alpha14:";; + short | recursive ) echo "Configuration of OpenBSM 1.0alpha15:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0alpha14 +OpenBSM configure 1.0alpha15 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0alpha14, which was +It was created by OpenBSM $as_me 1.0alpha15, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0alpha14 + VERSION=1.0alpha15 cat >>confdefs.h <<_ACEOF @@ -23479,7 +23479,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0alpha14, which was +This file was extended by OpenBSM $as_me 1.0alpha15, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23542,7 +23542,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0alpha14 +OpenBSM config.status 1.0alpha15 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/delphij_fork/contrib/openbsm/configure.ac#2 (text) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0alpha14], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#34 $]) +AC_INIT([OpenBSM], [1.0alpha15], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#35 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/delphij_fork/contrib/openbsm/etc/audit_event#2 (text) ==== @@ -1,6 +1,6 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#20 $ -# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.7 2007/04/16 15:41:56 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#25 $ +# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.8 2007/07/22 12:20:42 rwatson Exp $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -141,8 +141,13 @@ 148:AUE_SETKERNSTATE:setkernstate(2):ad 149:AUE_GETPORTAUDIT:getportaudit(2):ad 150:AUE_AUDITSTAT:auditstat(2):ad +151:AUE_REVOKE:revoke(2):cl +152:AUE_MAC:Solaris AUE_MAC:no 153:AUE_ENTERPROM:enter prom:ad 154:AUE_EXITPROM:exit prom:ad +155:AUE_IFLOAT:Solaris AUE_IFLOAT:no +156:AUE_PFLOAT:Solaris AUE_PFLOAT:no +157:AUE_UPRIV:Solaris AUE_UPRIV:no 158:AUE_IOCTL:ioctl(2):io 173:AUE_ONESIDE:one-sided session record:nt 174:AUE_MSGGETL:msggetl(2):ip @@ -166,19 +171,19 @@ 196:AUE_WRITEV:writev(2):no 197:AUE_NFS:nfs server:ad 198:AUE_READV:readv(2):no -199:AUE_OSTAT:old stat(2):fa +199:AUE_OSTAT:Solaris old stat(2):fa 200:AUE_SETUID:setuid(2):pc 201:AUE_STIME:old stime(2):ad 202:AUE_UTIME:old utime(2):fm 203:AUE_NICE:old nice(2):pc -204:AUE_OSETPGRP:old setpgrp(2):pc +204:AUE_OSETPGRP:Solaris old setpgrp(2):pc 205:AUE_SETGID:setgid(2):pc 206:AUE_READL:readl(2):no 207:AUE_READVL:readvl(2):no 209:AUE_DUP2:dup2(2):no 210:AUE_MMAP:mmap(2):no 211:AUE_AUDIT:audit(2):ot -212:AUE_PRIOCNTLSYS:priocntlsys(2):pc +212:AUE_PRIOCNTLSYS:Solaris priocntlsys(2):pc 213:AUE_MUNMAP:munmap(2):cl 214:AUE_SETEGID:setegid(2):pc 215:AUE_SETEUID:seteuid(2):pc @@ -202,7 +207,7 @@ 233:AUE_UTSSYS:utssys(2) - fusers:ad 234:AUE_STATVFS:statvfs(2):fa 235:AUE_XSTAT:xstat(2):fa -236:AUE_LXSTAT:lx6stat(2):fa +236:AUE_LXSTAT:lxstat(2):fa 237:AUE_LCHOWN:lchown(2):fm 238:AUE_MEMCNTL:memcntl(2):ot 239:AUE_SYSINFO:sysinfo(2):ad @@ -231,12 +236,43 @@ 262:AUE_P_ONLINE:p_online(2):ad 263:AUE_PROCESSOR_BIND:processor_bind(2):ad 264:AUE_INST_SYNC:inst_sync(2):ad +265:AUE_SOCKCONFIG:configure socket:nt 266:AUE_SETAUDIT_ADDR:setaudit_addr(2):ad 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad -268:AUE_CLOCK_SETTIME:clock_settime(2):ad -269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad +268:AUE_UMOUNT2:Solaris umount(2):ad +269:AUE_FSAT:fsat(2) - place holder:no +270:AUE_OPENAT_R:openat(2) - read:fr +271:AUE_OPENAT_RC:openat(2) - read,creat:fc,fr,fa,fm +272:AUE_OPENAT_RT:openat(2) - read,trunc:fd,fr,fa,fm +273:AUE_OPENAT_RTC:openat(2) - read,creat,trunc:fc,fd,fr,fa,fm +274:AUE_OPENAT_W:openat(2) - write:fw +275:AUE_OPENAT_WC:openat(2) - write,creat:fc,fw,fa,fm +276:AUE_OPENAT_WT:openat(2) - write,trunc:fd,fw,fa,fm +277:AUE_OPENAT_WTC:openat(2) - write,creat,trunc:fc,fd,fw,fa,fm +278:AUE_OPENAT_RW:openat(2) - read,write:fr,fw +279:AUE_OPENAT_RWC:openat(2) - read,write,create:fc,fw,fr,fa,fm +280:AUE_OPENAT_RWTC:openat(2) - read,write,creat,trunc:fc,fd,fw,fr,fa,fm +282:AUE_RENAMEAT:renameat(2):fc,fd +283:AUE_FSTATAT:fstatat(2):fa +284:AUE_FCHOWNAT:fchownat(2):fm +285:AUE_FUTIMESAT:futimesat(2):fm +286:AUE_UNLINKAT:unlinkat(2):fd +287:AUE_CLOCK_SETTIME:clock_settime(2):ad +288:AUE_NTP_ADJTIME:ntp_adjtime(2):ad +289:AUE_SETPPRIV:setppriv(2):pc +290:AUE_MODDEVPLCY:modctl(2) - configure device policy:ad +291:AUE_MODADDPRIV:modctl(2) - configure additional privilege:ad +292:AUE_CRYPTOADM:kernel cryptographic framework:ad +293:AUE_CONFIGKSSL:configure kernel SSL:ad +294:AUE_BRANDSYS:brandsys(2):ot +295:AUE_PF_POLICY_ADDRULE:Add IPsec policy rule:ad +296:AUE_PF_POLICY_DELRULE:Delete IPsec policy rule:ad +297:AUE_PF_POLICY_CLONE:Clone IPsec policy:ad +298:AUE_PF_POLICY_FLIP:Flip IPsec policy:ad +299:AUE_PF_POLICY_FLUSH:Flush IPsec policy rules:ad +300:AUE_PF_POLICY_ALGS:Update IPsec algorithms:ad # -# What follows are deprecated Darwin event numbers that may someday conflict +# What follows are deprecated Darwin event numbers that may soon conflict # with Solaris events. # 301:AUE_DARWIN_GETFSSTAT:getfsstat(2):fa @@ -293,7 +329,7 @@ 352:AUE_DARWIN_AUDITCTL:auditctl(2):ad 353:AUE_DARWIN_RFORK:rfork(2):pc 354:AUE_DARWIN_LCHMOD:lchmod(2):fm -355:AUE_DARWIN_SWAPOFF:swapoff():ad +355:AUE_DARWIN_SWAPOFF:swapoff(2):ad 356:AUE_DARWIN_INITPROCESS:init_process():pc 357:AUE_DARWIN_MAPFD:map_fd():fa 358:AUE_DARWIN_TASKFORPID:task_for_pid():pc @@ -310,7 +346,7 @@ 43005:AUE_PROFILE:profil(2):pc 43006:AUE_KTRACE:ktrace(2):pc 43007:AUE_SETLOGIN:setlogin(2):pc -43008:AUE_REVOKE:revoke(2):cl +43008:AUE_OPENBSM_REVOKE:revoke(2):cl 43009:AUE_UMASK:umask(2):pc 43010:AUE_MPROTECT:mprotect(2):fm 43011:AUE_MKFIFO:mkfifo(2):fc @@ -320,7 +356,7 @@ 43015:AUE_SETPRIVEXEC:setprivexec(2):pc 43016:AUE_ADDPROFILE:system call:pc 43017:AUE_KDEBUGTRACE:system call:pc -43018:AUE_FSTAT:fstat(2):fa +43018:AUE_OPENBSM_FSTAT:fstat(2):fa 43019:AUE_FPATHCONF:fpathconf(2):fa 43020:AUE_GETDIRENTRIES:getdirentries(2):no 43021:AUE_SYSCTL:sysctl(3):ot @@ -347,13 +383,13 @@ 43042:AUE_AUDITCTL:auditctl(2):ad 43043:AUE_RFORK:rfork(2):pc 43044:AUE_LCHMOD:lchmod(2):fm -43045:AUE_SWAPOFF:swapoff():ad +43045:AUE_SWAPOFF:swapoff(2):ad 43046:AUE_INITPROCESS:init_process():pc 43047:AUE_MAPFD:map_fd():fa 43048:AUE_TASKFORPID:task_for_pid():pc 43049:AUE_PIDFORTASK:pid_for_task():pc 43050:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot -43051:AUE_COPYFILE:copyfile():fr,fw +43051:AUE_COPYFILE:copyfile(2):fr,fw 43052:AUE_LUTIMES:lutimes(2):fm 43053:AUE_LCHFLAGS:lchflags(2):fm 43054:AUE_SENDFILE:sendfile(2):nt @@ -445,6 +481,16 @@ 43140:AUE_LISTEN:listen(2):nt 43141:AUE_MLOCKALL:mlockall(2):pc 43142:AUE_MUNLOCKALL:munlockall(2):pc +43143:AUE_CLOSEFROM:closefrom(2):cl +43144:AUE_FEXECVE:fexecve(2):pc,ex +43145:AUE_FACCESSAT:faccessat(2):fa +43146:AUE_FCHMODAT:fchmodat(2):fm +43147:AUE_LINKAT:linkat(2):fc +43148:AUE_MKDIRAT:mkdirat(2):fc +43149:AUE_MKFIFOAT:mkfifoat(2):fc +43150:AUE_MKNODAT:mknodat(2):fc +43151:AUE_READLINKAT:readlinkat(2):fr +43152:AUE_SYMLINKAT:symlinkat(2):fc # # User space system events. # ==== //depot/projects/delphij_fork/contrib/openbsm/libbsm/au_control.3#2 (text) ==== @@ -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#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#9 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -77,7 +77,7 @@ section for more information. .Pp The -.Fn sendac +.Fn endac function closes the .Xr audit_control 5 ==== //depot/projects/delphij_fork/contrib/openbsm/libbsm/au_event.3#2 (text) ==== @@ -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#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#8 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 @@ -131,7 +131,7 @@ .Fn getauevnum , .Fn getauevnum_r , and -.Fn getauevnuam +.Fn getauevnonam will return a reference to a .Vt "struct au_event_ent" or ==== //depot/projects/delphij_fork/contrib/openbsm/libbsm/audit_submit.3#2 (text) ==== @@ -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/audit_submit.3#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#12 $ .\" .Dd May 29, 2006 .Dt audit_submit 3 @@ -54,7 +54,7 @@ .Fa au_event . The subject token will be generated based on .Fa au_ctx . -The return token is dependant on the +The return token is dependent on the .Fa status and .Fa reterr ==== //depot/projects/delphij_fork/contrib/openbsm/libbsm/bsm_io.c#2 (text) ==== @@ -32,7 +32,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/bsm_io.c#48 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 $ */ #include <sys/types.h> @@ -1306,6 +1306,7 @@ print_delim(fp, del); print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); + print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } } ==== //depot/projects/delphij_fork/contrib/openbsm/libbsm/bsm_token.c#2 (text) ==== @@ -30,7 +30,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/bsm_token.c#62 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 $ */ #include <sys/types.h> @@ -411,7 +411,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); + ADD_MEM(dptr, internet_addr, 4 * sizeof(uint32_t)); return (t); } ==== //depot/projects/delphij_fork/lib/libarchive/archive_read_support_compression_program.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.1 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.2 2007/07/20 01:28:50 kientzle Exp $"); #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> @@ -113,6 +113,7 @@ { struct archive_decompress_program *state = a->decompressor->data; ssize_t ret, requested; + const void *child_buf; if (state->child_stdout == -1) return (-1); @@ -138,8 +139,10 @@ return (-1); if (state->child_in_buf_avail == 0) { + child_buf = state->child_in_buf; ret = (a->client_reader)(&a->archive, - a->client_data, (const void **)&state->child_in_buf); + a->client_data,&child_buf); + state->child_in_buf = (const char *)child_buf; if (ret < 0) { close(state->child_stdin); ==== //depot/projects/delphij_fork/lib/libc/stdlib/getenv.c#2 (text+ko) ==== @@ -33,7 +33,13 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.9 2007/07/04 00:00:39 scf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.10 2007/07/20 23:30:13 scf Exp $"); + + +static const char CorruptEnvFindMsg[] = + "environment corrupt; unable to find %.*s"; +static const char CorruptEnvValueMsg[] = + "environment corrupt; missing value for %s"; /* @@ -43,9 +49,12 @@ * allows environ to return to as it was before. * environSize: Number of variables environ can hold. Can only * increase. + * intEnviron: Internally-built environ. Exposed via environ during + * (re)builds of the environment. */ extern char **environ; static char **origEnviron; +static char **intEnviron = NULL; static int environSize = 0; /* @@ -84,7 +93,7 @@ /* Deinitialization of new environment. */ -static void __attribute__ ((destructor)) __clean_env(void); +static void __attribute__ ((destructor)) __clean_env_destructor(void); /* @@ -173,6 +182,64 @@ /* + * Remove variable added by putenv() from variable tracking array. + */ +static void +__remove_putenv(int envNdx) +{ + envVarsTotal--; + if (envVarsTotal > envNdx) + memmove(&(envVars[envNdx]), &(envVars[envNdx + 1]), + (envVarsTotal - envNdx) * sizeof (*envVars)); + memset(&(envVars[envVarsTotal]), 0, sizeof (*envVars)); + + return; +} + + +/* + * Deallocate the environment built from environ as well as environ then set + * both to NULL. Eases debugging of memory leaks. + */ +static void +__clean_env(bool freeVars) +{ + int envNdx; + + /* Deallocate environment and environ if created by *env(). */ + if (envVars != NULL) { + for (envNdx = envVarsTotal - 1; envNdx >= 0; envNdx--) + /* Free variables or deactivate them. */ + if (envVars[envNdx].putenv) { + if (!freeVars) + __remove_putenv(envNdx); + } else { + if (freeVars) + free(envVars[envNdx].name); + else + envVars[envNdx].active = false; + } + if (freeVars) { + free(envVars); + envVars = NULL; + } else + envActive = 0; + + /* Restore original environ if it has not updated by program. */ + if (origEnviron != NULL) { + if (environ == intEnviron) + environ = origEnviron; + free(intEnviron); + intEnviron = NULL; + environSize = 0; + } + } + + return; +} + + +/* * Using the environment, rebuild the environ array for use by other C library * calls that depend upon it. */ @@ -187,20 +254,23 @@ /* Resize environ. */ if (newEnvironSize > environSize) { tmpEnvironSize = newEnvironSize * 2; - tmpEnviron = realloc(environ, sizeof (*environ) * + tmpEnviron = realloc(intEnviron, sizeof (*intEnviron) * (tmpEnvironSize + 1)); if (tmpEnviron == NULL) return (-1); environSize = tmpEnvironSize; - environ = tmpEnviron; + intEnviron = tmpEnviron; } envActive = newEnvironSize; /* Assign active variables to environ. */ for (envNdx = envVarsTotal - 1, environNdx = 0; envNdx >= 0; envNdx--) if (envVars[envNdx].active) - environ[environNdx++] = envVars[envNdx].name; - environ[environNdx] = NULL; + intEnviron[environNdx++] = envVars[envNdx].name; + intEnviron[environNdx] = NULL; + + /* Always set environ which may have been replaced by program. */ + environ = intEnviron; return (0); } @@ -241,15 +311,12 @@ char **env; int activeNdx; int envNdx; - int rtrnVal; int savedErrno; size_t nameLen; /* Check for non-existant environment. */ - if (environ == NULL) + if (environ == NULL || environ[0] == NULL) return (0); - if (environ[0] == NULL) - goto SaveEnviron; /* Count environment variables. */ for (env = environ, envVarsTotal = 0; *env != NULL; env++) @@ -274,8 +341,7 @@ envVars[envNdx].valueSize = strlen(envVars[envNdx].value); } else { - warnx("environment corrupt; missing value for %s", - envVars[envNdx].name); + warnx(CorruptEnvValueMsg, envVars[envNdx].name); errno = EFAULT; goto Failure; } @@ -290,8 +356,7 @@ activeNdx = envVarsTotal - 1; if (__findenv(envVars[envNdx].name, nameLen, &activeNdx, false) == NULL) { - warnx("environment corrupt; unable to find %.*s", - nameLen, envVars[envNdx].name); + warnx(CorruptEnvFindMsg, nameLen, envVars[envNdx].name); errno = EFAULT; goto Failure; } @@ -299,24 +364,14 @@ } /* Create a new environ. */ -SaveEnviron: origEnviron = environ; environ = NULL; - if (envVarsTotal > 0) { - rtrnVal = __rebuild_environ(envVarsTotal); - if (rtrnVal == -1) { - savedErrno = errno; - __clean_env(); - errno = savedErrno; - } - } else - rtrnVal = 0; - - return (rtrnVal); + if (__rebuild_environ(envVarsTotal) == 0) + return (0); Failure: savedErrno = errno; - __clean_env(); + __clean_env(true); errno = savedErrno; return (-1); @@ -324,48 +379,18 @@ /* - * Remove variable added by putenv() from variable tracking array. + * Destructor function with default argument to __clean_env(). */ static void -__remove_putenv(int envNdx) +__clean_env_destructor(void) { - memmove(&(envVars[envNdx]), &(envVars[envNdx + 1]), - (envVarsTotal - envNdx) * sizeof (*envVars)); - envVarsTotal--; + __clean_env(true); return; } /* - * Deallocate the environment built from environ as well as environ then set - * both to NULL. Eases debugging of memory leaks. - */ -static void -__clean_env(void) -{ - int envNdx; - - /* Deallocate environment and environ if created by *env(). */ - if (envVars != NULL) { - for (envNdx = 0; envNdx < envVarsTotal; envNdx++) - if (!envVars[envNdx].putenv) - free(envVars[envNdx].name); - free(envVars); - envVars = NULL; - >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707231459.l6NExqjW075018>