Date: Sat, 6 Dec 2008 23:39:37 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 154223 for review Message-ID: <200812062339.mB6Ndb5e031593@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=154223 Change 154223 by sam@sam_ebb on 2008/12/06 23:39:00 IFC @ 154222 Affected files ... .. //depot/projects/vap/UPDATING#24 integrate .. //depot/projects/vap/contrib/openbsm/CREDITS#1 branch .. //depot/projects/vap/contrib/openbsm/HISTORY#3 delete .. //depot/projects/vap/contrib/openbsm/INSTALL#1 branch .. //depot/projects/vap/contrib/openbsm/LICENSE#3 integrate .. //depot/projects/vap/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/NEWS#1 branch .. //depot/projects/vap/contrib/openbsm/README#3 integrate .. //depot/projects/vap/contrib/openbsm/TODO#3 integrate .. //depot/projects/vap/contrib/openbsm/VERSION#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/vap/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/vap/contrib/openbsm/bin/auditfilterd/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditreduce/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/auditreduce/auditreduce.h#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/praudit/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/praudit/praudit.1#3 integrate .. //depot/projects/vap/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/vap/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/vap/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/vap/contrib/openbsm/compat/clock_gettime.h#3 integrate .. //depot/projects/vap/contrib/openbsm/compat/strlcat.h#3 integrate .. //depot/projects/vap/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/vap/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/vap/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/vap/contrib/openbsm/configure#3 integrate .. //depot/projects/vap/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/vap/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/au_class.3#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/au_free_token.3#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_flags.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/vap/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/vap/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/man/audit.2#3 integrate .. //depot/projects/vap/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/vap/contrib/openbsm/man/audit_class.5#3 integrate .. //depot/projects/vap/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/vap/contrib/openbsm/man/audit_event.5#3 integrate .. //depot/projects/vap/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/vap/contrib/openbsm/man/audit_warn.5#3 integrate .. //depot/projects/vap/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/vap/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/vap/contrib/openbsm/man/getaudit.2#3 integrate .. //depot/projects/vap/contrib/openbsm/man/getauid.2#3 integrate .. //depot/projects/vap/contrib/openbsm/man/setaudit.2#3 integrate .. //depot/projects/vap/contrib/openbsm/man/setauid.2#3 integrate .. //depot/projects/vap/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/modules/auditfilter_noop/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 integrate .. //depot/projects/vap/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/vap/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/vap/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/vap/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/vap/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/vap/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/vap/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/vap/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/vap/contrib/openbsm/test/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/test/bsm/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/vap/contrib/openbsm/tools/Makefile.am#3 integrate .. //depot/projects/vap/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/vap/etc/newsyslog.conf#4 integrate .. //depot/projects/vap/etc/syslog.conf#3 integrate .. //depot/projects/vap/lib/libarchive/archive.h#5 integrate .. //depot/projects/vap/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/vap/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/vap/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/vap/lib/libarchive/archive_read_private.h#6 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_compression_bzip2.c#5 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_compression_none.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_compression_program.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_ar.c#7 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#9 integrate .. //depot/projects/vap/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/vap/lib/libarchive/archive_string.h#6 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#18 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#15 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/vap/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/vap/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/vap/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/vap/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_pax_truncated.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_perms.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio.c#5 integrate .. //depot/projects/vap/lib/libc/string/Makefile.inc#5 integrate .. //depot/projects/vap/lib/libc/string/Symbol.map#5 integrate .. //depot/projects/vap/lib/libc/string/strdup.3#3 integrate .. //depot/projects/vap/lib/libc/string/strndup.c#1 branch .. //depot/projects/vap/lib/libc/string/strsep.3#3 integrate .. //depot/projects/vap/lib/libmd/Makefile#3 integrate .. //depot/projects/vap/lib/libpmc/libpmc.c#8 integrate .. //depot/projects/vap/lib/libstand/bootp.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_fork.c#5 integrate .. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#6 integrate .. //depot/projects/vap/lib/libutil/Makefile#7 integrate .. //depot/projects/vap/lib/libutil/kinfo_getfile.c#1 branch .. //depot/projects/vap/lib/libutil/kinfo_getvmmap.c#1 branch .. //depot/projects/vap/lib/libutil/libutil.h#5 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld_lock.h#5 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#10 integrate .. //depot/projects/vap/sbin/newfs/Makefile#3 integrate .. //depot/projects/vap/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/vap/sbin/newfs/newfs.8#5 integrate .. //depot/projects/vap/sbin/newfs/newfs.c#4 integrate .. //depot/projects/vap/sbin/newfs/newfs.h#4 integrate .. //depot/projects/vap/sbin/newfs_msdos/newfs_msdos.8#4 integrate .. //depot/projects/vap/sbin/newfs_msdos/newfs_msdos.c#4 integrate .. //depot/projects/vap/share/man/man4/bce.4#4 integrate .. //depot/projects/vap/share/man/man4/upgt.4#5 integrate .. //depot/projects/vap/share/man/man7/ports.7#5 integrate .. //depot/projects/vap/sys/amd64/amd64/db_trace.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/intr_machdep.c#9 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/vap/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/vap/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/vap/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/vap/sys/boot/common/loader.8#6 integrate .. //depot/projects/vap/sys/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/vap/sys/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/vap/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/vap/sys/bsm/audit.h#4 integrate .. //depot/projects/vap/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/vap/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/vap/sys/bsm/audit_record.h#5 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_misc.c#13 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sockio.c#7 integrate .. //depot/projects/vap/sys/conf/files#60 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_subr.c#9 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#7 integrate .. //depot/projects/vap/sys/contrib/rdma/rdma_cma.c#4 integrate .. //depot/projects/vap/sys/dev/adb/adb.h#2 integrate .. //depot/projects/vap/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/vap/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/vap/sys/dev/adb/adb_mouse.c#3 integrate .. //depot/projects/vap/sys/dev/adb/adbvar.h#3 integrate .. //depot/projects/vap/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/vap/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/vap/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/vap/sys/dev/cardbus/cardbus_device.c#4 integrate .. //depot/projects/vap/sys/dev/cardbus/cardbusvar.h#7 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#9 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#19 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#8 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#14 integrate .. //depot/projects/vap/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/vap/sys/dev/fxp/if_fxpreg.h#5 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_amd.c#11 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_intel.c#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_ppro.c#11 integrate .. //depot/projects/vap/sys/dev/hwpmc/pmc_events.h#7 integrate .. //depot/projects/vap/sys/dev/jme/if_jme.c#6 integrate .. //depot/projects/vap/sys/dev/jme/if_jmereg.h#5 integrate .. //depot/projects/vap/sys/dev/jme/if_jmevar.h#2 integrate .. //depot/projects/vap/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/vap/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/vap/sys/dev/mmc/mmcsd.c#7 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#17 integrate .. //depot/projects/vap/sys/dev/sdhci/sdhci.c#4 integrate .. //depot/projects/vap/sys/dev/usb/if_ural.c#26 integrate .. //depot/projects/vap/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/vap/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/vap/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/vap/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/vap/sys/geom/journal/g_journal.h#3 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC#28 integrate .. //depot/projects/vap/sys/i386/conf/XEN#6 integrate .. //depot/projects/vap/sys/i386/include/atomic.h#8 integrate .. //depot/projects/vap/sys/i386/include/xen/xenbus.h#2 delete .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#9 integrate .. //depot/projects/vap/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#17 integrate .. //depot/projects/vap/sys/kern/kern_exit.c#15 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#13 integrate .. //depot/projects/vap/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/vap/sys/kern/kern_linker.c#13 integrate .. //depot/projects/vap/sys/kern/kern_module.c#9 integrate .. //depot/projects/vap/sys/kern/kern_poll.c#10 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#17 integrate .. //depot/projects/vap/sys/kern/kern_uuid.c#7 integrate .. //depot/projects/vap/sys/kern/uipc_shm.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/vap/sys/libkern/iconv.c#5 integrate .. //depot/projects/vap/sys/modules/ae/Makefile#2 integrate .. //depot/projects/vap/sys/modules/ath/Makefile#8 integrate .. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#12 integrate .. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#12 integrate .. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#13 integrate .. //depot/projects/vap/sys/modules/bridgestp/Makefile#3 integrate .. //depot/projects/vap/sys/modules/cxgb/iw_cxgb/Makefile#4 integrate .. //depot/projects/vap/sys/modules/if_ef/Makefile#5 integrate .. //depot/projects/vap/sys/modules/if_vlan/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ip_mroute_mod/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/vap/sys/modules/linprocfs/Makefile#5 integrate .. //depot/projects/vap/sys/modules/linux/Makefile#6 integrate .. //depot/projects/vap/sys/modules/netgraph/atm/atm/Makefile#3 integrate .. //depot/projects/vap/sys/modules/netgraph/ether/Makefile#4 integrate .. //depot/projects/vap/sys/modules/netgraph/gif/Makefile#5 integrate .. //depot/projects/vap/sys/modules/nfsclient/Makefile#6 integrate .. //depot/projects/vap/sys/modules/pf/Makefile#6 integrate .. //depot/projects/vap/sys/modules/wlan/Makefile#13 integrate .. //depot/projects/vap/sys/net/bridgestp.c#6 integrate .. //depot/projects/vap/sys/net/if.c#21 integrate .. //depot/projects/vap/sys/net/if_bridge.c#10 integrate .. //depot/projects/vap/sys/net/if_ef.c#9 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/vap/sys/net/if_faith.c#11 integrate .. //depot/projects/vap/sys/net/if_gre.c#14 integrate .. //depot/projects/vap/sys/net/if_loop.c#16 integrate .. //depot/projects/vap/sys/net/if_mib.c#8 integrate .. //depot/projects/vap/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/vap/sys/net/if_stf.c#13 integrate .. //depot/projects/vap/sys/net/if_var.h#14 integrate .. //depot/projects/vap/sys/net/if_vlan.c#14 integrate .. //depot/projects/vap/sys/net/raw_cb.c#12 integrate .. //depot/projects/vap/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/vap/sys/net/route.c#16 integrate .. //depot/projects/vap/sys/net/rtsock.c#15 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#32 integrate .. //depot/projects/vap/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/vap/sys/netgraph/ng_eiface.c#10 integrate .. //depot/projects/vap/sys/netgraph/ng_ether.c#8 integrate .. //depot/projects/vap/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/vap/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#16 integrate .. //depot/projects/vap/sys/netinet/igmp.c#10 integrate .. //depot/projects/vap/sys/netinet/in.c#12 integrate .. //depot/projects/vap/sys/netinet/in.h#9 integrate .. //depot/projects/vap/sys/netinet/in_gif.c#9 integrate .. //depot/projects/vap/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#24 integrate .. //depot/projects/vap/sys/netinet/in_rmx.c#11 integrate .. //depot/projects/vap/sys/netinet/ip6.h#7 integrate .. //depot/projects/vap/sys/netinet/ip_carp.c#12 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/vap/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/vap/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/vap/sys/netinet/ip_id.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#14 integrate .. //depot/projects/vap/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_options.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_output.c#14 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/vap/sys/netinet/sctp.h#7 integrate .. //depot/projects/vap/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/vap/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_auth.h#3 integrate .. //depot/projects/vap/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/vap/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/vap/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/vap/sys/netinet/sctp_indata.h#4 integrate .. //depot/projects/vap/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/vap/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/vap/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/vap/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/vap/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/vap/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/vap/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/vap/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/vap/sys/netinet/sctp_usrreq.c#12 integrate .. //depot/projects/vap/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#14 integrate .. //depot/projects/vap/sys/netinet/sctputil.h#6 integrate .. //depot/projects/vap/sys/netinet/tcp_hostcache.c#9 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/vap/sys/netinet/tcp_offload.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#17 integrate .. //depot/projects/vap/sys/netinet/tcp_reass.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#11 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/vap/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/vap/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/vap/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/vap/sys/netinet/vinet.h#3 integrate .. //depot/projects/vap/sys/netinet6/dest6.c#8 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#11 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#16 integrate .. //depot/projects/vap/sys/netinet6/in6.c#13 integrate .. //depot/projects/vap/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/vap/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#15 integrate .. //depot/projects/vap/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#13 integrate .. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#8 integrate .. //depot/projects/vap/sys/netinet6/ip6_mroute.c#9 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/vap/sys/netinet6/mld6.c#12 integrate .. //depot/projects/vap/sys/netinet6/nd6.c#10 integrate .. //depot/projects/vap/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/vap/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#18 integrate .. //depot/projects/vap/sys/netinet6/route6.c#8 integrate .. //depot/projects/vap/sys/netinet6/scope6.c#9 integrate .. //depot/projects/vap/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#18 integrate .. //depot/projects/vap/sys/netinet6/vinet6.h#3 integrate .. //depot/projects/vap/sys/netipsec/ipsec_input.c#9 integrate .. //depot/projects/vap/sys/netipsec/ipsec_output.c#10 integrate .. //depot/projects/vap/sys/netipsec/key.c#13 integrate .. //depot/projects/vap/sys/netipsec/keysock.c#10 integrate .. //depot/projects/vap/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/vap/sys/netipsec/xform_ipip.c#9 integrate .. //depot/projects/vap/sys/nfsclient/bootp_subr.c#10 integrate .. //depot/projects/vap/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#20 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/vap/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/vap/sys/pci/if_rl.c#11 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/vap/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/vap/sys/powerpc/powermac/cuda.c#3 integrate .. //depot/projects/vap/sys/powerpc/powermac/cudavar.h#2 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/vap/sys/sparc64/conf/GENERIC#22 integrate .. //depot/projects/vap/sys/sun4v/conf/GENERIC#9 integrate .. //depot/projects/vap/sys/sys/buf_ring.h#2 integrate .. //depot/projects/vap/sys/sys/module.h#7 integrate .. //depot/projects/vap/sys/sys/proc.h#27 integrate .. //depot/projects/vap/sys/sys/sysctl.h#12 integrate .. //depot/projects/vap/sys/sys/user.h#13 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_lookup.c#13 integrate .. //depot/projects/vap/sys/xen/gnttab.c#4 integrate .. //depot/projects/vap/sys/xen/gnttab.h#3 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_client.c#4 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_comms.c#4 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_comms.h#3 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_dev.c#4 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_if.m#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe.c#4 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe_backend.c#4 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_xs.c#5 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbusvar.h#1 branch .. //depot/projects/vap/tools/test/pthread_vfork/pthread_vfork_test.c#1 branch .. //depot/projects/vap/usr.bin/cpio/Makefile#4 integrate .. //depot/projects/vap/usr.bin/cpio/cmdline.c#4 integrate .. //depot/projects/vap/usr.bin/cpio/config_freebsd.h#3 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.c#9 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.h#6 integrate .. //depot/projects/vap/usr.bin/cpio/cpio_platform.h#2 integrate .. //depot/projects/vap/usr.bin/procstat/Makefile#2 integrate .. //depot/projects/vap/usr.bin/procstat/procstat_files.c#6 integrate .. //depot/projects/vap/usr.bin/procstat/procstat_vm.c#3 integrate .. //depot/projects/vap/usr.bin/tar/Makefile#10 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar.1#11 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar.h#10 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/vap/usr.bin/wc/wc.1#3 integrate .. //depot/projects/vap/usr.bin/wc/wc.c#3 integrate .. //depot/projects/vap/usr.sbin/audit/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/auditd/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/boot0cfg/boot0cfg.8#3 integrate .. //depot/projects/vap/usr.sbin/boot0cfg/boot0cfg.c#5 integrate Differences ... ==== //depot/projects/vap/UPDATING#24 (text+ko) ==== @@ -26,7 +26,7 @@ __FreeBSD_version 800057 marks the switchover from the binary ath hal to source code. Users must add the line: - options ATH_SUPPORT_AR5416 + options AH_SUPPORT_AR5416 to their kernel config files when specifying: @@ -1178,4 +1178,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.550 2008/12/01 16:53:01 sam Exp $ +$FreeBSD: src/UPDATING,v 1.551 2008/12/01 23:09:58 sam Exp $ ==== //depot/projects/vap/contrib/openbsm/LICENSE#3 (text) ==== @@ -1,3 +1,5 @@ +OpenBSM Copyrights and Licensing + OpenBSM is covered by a number of copyrights, with licenses being either two or three clause BSD licenses. Individual file headers should be consulted for specific copyrights on specific components. The TrustedBSD Project would @@ -30,4 +32,4 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. -$P4: //depot/projects/trustedbsd/openbsm/LICENSE#4 $ +$P4: //depot/projects/trustedbsd/openbsm/LICENSE#5 $ ==== //depot/projects/vap/contrib/openbsm/Makefile.am#3 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#3 $ # SUBDIRS = \ @@ -7,7 +7,8 @@ libbsm \ bin \ man \ - modules + modules \ + sys EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/vap/contrib/openbsm/Makefile.in#3 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#5 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#8 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -38,7 +38,7 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \ - $(top_srcdir)/configure TODO config/config.guess \ + $(top_srcdir)/configure INSTALL NEWS TODO config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/ltmain.sh config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -116,6 +116,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MIG = @MIG@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -187,7 +188,8 @@ libbsm \ bin \ man \ - modules + modules \ + sys EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/vap/contrib/openbsm/README#3 (text) ==== @@ -1,4 +1,4 @@ -OpenBSM 1.0 +OpenBSM 1.1 alpha 1 Introduction @@ -16,12 +16,13 @@ OpenBSM consists of several directories: bin/ Audit-related command line tools - bsm/ System include files for BSM + bsm/ Library include files for BSM compat/ Compatibility code to build on various OS's etc/ Sample /etc/security configuration files libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages modules/ Directory for auditfilterd module source + sys/ System include files for BSM test/ Test token sets and geneneration program tools/ Tool directory, including audump to dump databases @@ -34,66 +35,9 @@ audump Debugging tool to parse and print audit databases praudit Tool to print audit trails - Building + Build and Installation -OpenBSM is currently built using autoconf and automake, which should allow -for building on a range of operating systems, including FreeBSD, Mac OS X, -and Linux. Depending on the availability of audit facilities in the -underlying operating system, some components that depend on kernel audit -support are built conditionally. Typically, build will be performed using: - - ./configure - make - -To install, use: - - make install - -You may wish to specify that the OpenBSM components not be installed in the -base system, rather in a specific directory. This may be done using the ---prefix argument to configure. If installing to a specific directory, -remember to update your library path so that running tools from that -directory the correct libbsm is used: - - ./configure --prefix=/home/rwatson/openbsm - make - make install - LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - -You will need to manually propagate openbsm/etc/* into /etc on your system; -this is not done automatically so as to avoid disrupting the current -configuration. Currently, the locations of these files is not configurable. - - Credits - -The following organizations and individuals have contributed substantially to -the development of OpenBSM: - - Apple Computer, Inc. - McAfee Research, McAfee, Inc. - SPARTA, Inc. - Robert Watson - Wayne Salamon - Suresh Krishnaswamy - Kevin Van Vechten - Tom Rhodes - Wojciech Koszek - Chunyang Yuan - Poul-Henning Kamp - Christian Brueffer - Olivier Houchard - Christian Peron - Martin Fong - Pawel Worach - Martin Englund - 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 -OpenBSM implementation. +Please see the file INSTALL for build and installation instructions. Contributions @@ -111,4 +55,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#24 $ +$P4: //depot/projects/trustedbsd/openbsm/README#32 $ ==== //depot/projects/vap/contrib/openbsm/TODO#3 (text) ==== @@ -1,5 +1,5 @@ -- Teach libbsm about any additional 64-bit token types that are present - in more recent Solaris versions. +OpenBSM TODO + - Build a regression test suite for libbsm that generates each token type and then compares the results with known good data. Make sure to test that things work properly with respect to endianness of the local @@ -18,5 +18,7 @@ trailer context. - Put hostname in trail file name. - Document audit_warn event arguments. +- Allow the path /etc/security to be configured at configure-time so that + alternative locations can be used. -$P4: //depot/projects/trustedbsd/openbsm/TODO#9 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#11 $ ==== //depot/projects/vap/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0 +OPENBSM_1_1_ALPHA_2 ==== //depot/projects/vap/contrib/openbsm/bin/Makefile.in#3 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#5 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#8 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -104,6 +104,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MIG = @MIG@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ ==== //depot/projects/vap/contrib/openbsm/bin/audit/Makefile.am#3 (text) ==== @@ -1,10 +1,23 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#4 $ # -INCLUDES = -I$(top_srcdir) +if USE_NATIVE_INCLUDES +INCLUDES = -I$(top_builddir) -I$(top_srcdir) +else +INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sys +endif sbin_PROGRAMS = audit -audit_SOURCES = audit.c audit_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = audit.8 + +if USE_MACH_IPC +audit_SOURCES = auditd_control_user.c audit.c +CLEANFILES = auditd_control_user.c auditd_control_user.h + +auditd_control_user.c: $(top_srcdir)/bin/auditd/auditd_control.defs + $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs +else +audit_SOURCES = audit.c +endif ==== //depot/projects/vap/contrib/openbsm/bin/audit/Makefile.in#3 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#9 $ # VPATH = @srcdir@ @@ -49,7 +49,10 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) -am_audit_OBJECTS = audit.$(OBJEXT) +am__audit_SOURCES_DIST = audit.c auditd_control_user.c +@USE_MACH_IPC_FALSE@am_audit_OBJECTS = audit.$(OBJEXT) +@USE_MACH_IPC_TRUE@am_audit_OBJECTS = auditd_control_user.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit.$(OBJEXT) audit_OBJECTS = $(am_audit_OBJECTS) audit_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ @@ -65,7 +68,7 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(audit_SOURCES) -DIST_SOURCES = $(audit_SOURCES) +DIST_SOURCES = $(am__audit_SOURCES_DIST) man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man8_MANS) @@ -113,6 +116,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MIG = @MIG@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,10 +183,13 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I$(top_srcdir) -audit_SOURCES = audit.c +@USE_NATIVE_INCLUDES_FALSE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sys +@USE_NATIVE_INCLUDES_TRUE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) audit_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = audit.8 +@USE_MACH_IPC_FALSE@audit_SOURCES = audit.c +@USE_MACH_IPC_TRUE@audit_SOURCES = auditd_control_user.c audit.c +@USE_MACH_IPC_TRUE@CLEANFILES = auditd_control_user.c auditd_control_user.h all: all-am .SUFFIXES: @@ -255,6 +262,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_control_user.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -426,6 +434,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -511,6 +520,9 @@ tags uninstall uninstall-am uninstall-man uninstall-man8 \ uninstall-sbinPROGRAMS + +@USE_MACH_IPC_TRUE@auditd_control_user.c: $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/vap/contrib/openbsm/bin/audit/audit.8#3 (text) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004 Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -10,7 +10,7 @@ .\" 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 +.\" 3. Neither the name of Apple 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. .\" @@ -25,7 +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. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#11 $ .\" .Dd October 2, 2006 .Dt AUDIT 8 ==== //depot/projects/vap/contrib/openbsm/bin/audit/audit.c#3 (text) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2005 Apple Computer, Inc. +/*- + * Copyright (c) 2005-2008 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * 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 + * 3. Neither the name of Apple 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. * @@ -26,7 +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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#11 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -37,7 +37,12 @@ */ #include <sys/types.h> +#include <config/config.h> +#ifdef HAVE_FULL_QUEUE_H #include <sys/queue.h> +#else /* !HAVE_FULL_QUEUE_H */ +#include <compat/queue.h> +#endif /* !HAVE_FULL_QUEUE_H */ #include <sys/uio.h> #include <bsm/libbsm.h> @@ -47,6 +52,58 @@ #include <stdlib.h> #include <unistd.h> + +static int send_trigger(unsigned int); + +#ifdef USE_MACH_IPC +#include <mach/mach.h> +#include <servers/netname.h> +#include <mach/message.h> +#include <mach/port.h> +#include <mach/mach_error.h> +#include <mach/host_special_ports.h> +#include <servers/bootstrap.h> + +#include "auditd_control_user.h" + +static int +send_trigger(unsigned int trigger) +{ + mach_port_t serverPort; + kern_return_t error; + + error = host_get_audit_control_port(mach_host_self(), &serverPort); + if (error != KERN_SUCCESS) { + mach_error("Cannot get auditd_control Mach port: ", error); + return (-1); + } + + error = auditd_control(serverPort, trigger); + if (error != KERN_SUCCESS) { + mach_error("Error sending trigger: ", error); + return (-1); + } + + return (0); +} + +#else /* ! USE_MACH_IPC */ + +static int +send_trigger(unsigned int trigger) +{ + int error; + + error = auditon(A_SENDTRIGGER, &trigger, sizeof(trigger)); + if (error != 0) { + perror("Error sending trigger"); + return (-1); + } + + return (0); +} +#endif /* ! USE_MACH_IPC */ + static void usage(void) { @@ -88,11 +145,9 @@ break; } } - if (auditon(A_SENDTRIGGER, &trigger, sizeof(trigger)) < 0) { - perror("Error sending trigger"); + if (send_trigger(trigger) < 0) exit(-1); - } else { - printf("Trigger sent.\n"); - exit (0); - } + + printf("Trigger sent.\n"); + exit (0); } ==== //depot/projects/vap/contrib/openbsm/bin/auditd/Makefile.am#3 (text) ==== @@ -1,10 +1,26 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#4 $ # -INCLUDES = -I$(top_srcdir) +if USE_NATIVE_INCLUDES +INCLUDES = -I$(top_builddir) -I$(top_srcdir) +else +INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sys +endif sbin_PROGRAMS = auditd -auditd_SOURCES = audit_warn.c auditd.c auditd_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = auditd.8 + +if USE_MACH_IPC +auditd_SOURCES = auditd_control_server.c audit_triggers_server.c audit_warn.c auditd.c +CLEANFILES = auditd_control_server.c auditd_control_server.h audit_triggers_server.c audit_triggers_server.h + +auditd_control_server.c: auditd_control.defs + $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h $(top_srcdir)/bin/auditd/auditd_control.defs + +audit_triggers_server.c: audit_triggers.defs + $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h $(top_srcdir)/bin/auditd/audit_triggers.defs +else +auditd_SOURCES = audit_warn.c auditd.c +endif ==== //depot/projects/vap/contrib/openbsm/bin/auditd/Makefile.in#3 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#9 $ # VPATH = @srcdir@ @@ -49,7 +49,14 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) -am_auditd_OBJECTS = audit_warn.$(OBJEXT) auditd.$(OBJEXT) +am__auditd_SOURCES_DIST = audit_warn.c auditd.c \ + auditd_control_server.c audit_triggers_server.c +@USE_MACH_IPC_FALSE@am_auditd_OBJECTS = audit_warn.$(OBJEXT) \ +@USE_MACH_IPC_FALSE@ auditd.$(OBJEXT) +@USE_MACH_IPC_TRUE@am_auditd_OBJECTS = \ +@USE_MACH_IPC_TRUE@ auditd_control_server.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit_triggers_server.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit_warn.$(OBJEXT) auditd.$(OBJEXT) auditd_OBJECTS = $(am_auditd_OBJECTS) auditd_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ @@ -65,7 +72,7 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812062339.mB6Ndb5e031593>