From owner-p4-projects@FreeBSD.ORG  Mon Oct 29 09:27:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4E5316A41A; Mon, 29 Oct 2007 09:27:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4968916A417
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 09:27:09 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BA9913C465
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 09:27:09 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T9R8Cw037050
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 09:27:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T9R1Pk037042
	for perforce@freebsd.org; Mon, 29 Oct 2007 09:27:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 29 Oct 2007 09:27:01 GMT
Message-Id: <200710290927.l9T9R1Pk037042@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128280 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Oct 2007 09:27:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=128280

Change 128280 by rwatson@rwatson_zoo on 2007/10/29 09:26:00

	Integrate TrustedBSD audit3 branch from TrustedBSD base branch
	through @128279.

Affected files ...

.. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#21 integrate
.. //depot/projects/trustedbsd/audit3/UPDATING#26 integrate
.. //depot/projects/trustedbsd/audit3/bin/ps/extern.h#3 integrate
.. //depot/projects/trustedbsd/audit3/bin/ps/keyword.c#5 integrate
.. //depot/projects/trustedbsd/audit3/bin/ps/print.c#5 integrate
.. //depot/projects/trustedbsd/audit3/bin/ps/ps.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap.h#6 integrate
.. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FIXES#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FREEBSD-upgrade#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/lib.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/one-true-awk/tran.c#3 integrate
.. //depot/projects/trustedbsd/audit3/etc/Makefile#17 integrate
.. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#20 integrate
.. //depot/projects/trustedbsd/audit3/etc/rc.d/amd#7 integrate
.. //depot/projects/trustedbsd/audit3/etc/rc.d/named#7 integrate
.. //depot/projects/trustedbsd/audit3/etc/rc.d/nfslocking#6 delete
.. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#22 integrate
.. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes-o.real#4 integrate
.. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/limerick#5 integrate
.. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate
.. //depot/projects/trustedbsd/audit3/include/_ctype.h#3 integrate
.. //depot/projects/trustedbsd/audit3/include/pthread_np.h#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/Makefile#20 integrate
.. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_none.c#8 integrate
.. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#19 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/locale/iswctype.c#4 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/sys/kldstat.2#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/libelf/elf.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libelf/elf_update.3#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_proc.c#11 integrate
.. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_unix/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit3/lib/libstand/Makefile#9 integrate
.. //depot/projects/trustedbsd/audit3/lib/libstand/tftp.c#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/libthr/libthr.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/ncurses/ncurses/Makefile#6 integrate
.. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate
.. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#13 integrate
.. //depot/projects/trustedbsd/audit3/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/trustedbsd/audit3/sbin/gpt/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit3/sbin/gpt/add.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sbin/gpt/boot.c#1 branch
.. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.8#8 integrate
.. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sbin/gpt/show.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#19 integrate
.. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sbin/kldstat/kldstat.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sbin/route/route.c#6 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_attr.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_attr_get_np.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_attr_setcreatesuspend_np.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_barrier_destroy.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_barrierattr.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cancel.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cleanup_pop.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cleanup_push.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_broadcast.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_destroy.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_init.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_signal.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_timedwait.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_wait.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_condattr.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_create.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_detach.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_equal.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_exit.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_getconcurrency.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_getspecific.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_join.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_key_create.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_key_delete.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_kill.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_main_np.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_multi_np.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_destroy.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_init.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_lock.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_trylock.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_unlock.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutexattr.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutexattr_getkind_np.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_once.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_resume_all_np.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_resume_np.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_destroy.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_init.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_rdlock.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_timedrdlock.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_timedwrlock.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_unlock.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlock_wrlock.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_destroy.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_getpshared.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_init.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_rwlockattr_setpshared.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_schedparam.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_self.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_set_name_np.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_setspecific.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_sigmask.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_spin_init.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_spin_lock.3#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_switch_add_np.3#4 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_testcancel.3#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#21 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man5/src.conf.5#11 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#11 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man9/Makefile#15 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man9/kproc.9#1 branch
.. //depot/projects/trustedbsd/audit3/share/man/man9/kthread.9#4 integrate
.. //depot/projects/trustedbsd/audit3/share/misc/committers-doc.dot#3 integrate
.. //depot/projects/trustedbsd/audit3/share/misc/committers-src.dot#8 integrate
.. //depot/projects/trustedbsd/audit3/share/misc/pci_vendors#6 integrate
.. //depot/projects/trustedbsd/audit3/share/mk/bsd.compat.mk#4 integrate
.. //depot/projects/trustedbsd/audit3/share/mk/bsd.lib.mk#13 integrate
.. //depot/projects/trustedbsd/audit3/share/mk/bsd.own.mk#11 integrate
.. //depot/projects/trustedbsd/audit3/share/mk/sys.mk#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/local_apic.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/msi.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/nexus.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/conf/DEFAULTS#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/include/pc/bios.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/isa/clock.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91rm92reg.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.at91#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.kb920x#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot2/boot2.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac_init.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/lib.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/common/ufsread.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/boot2/boot2.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/bioscd.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biosdisk.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biosmem.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biossmap.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/devicename.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/pc98/boot2/boot.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/bioscd.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/biosdisk.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/pc98/loader/main.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_file.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_getcwd.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ntoskrnl.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_fcntl.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files#37 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.arm#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.ia64#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.pc98#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.powerpc#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.sun4v#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_if.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_ioctl.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_table.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/ddb/db_examine.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_ibm.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_ec.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci_link.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_thermal.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic_osm_lib.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cd.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cd.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath_pci.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/bktr/msp34xx.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ciss/ciss.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/firewire/firewire.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/entry.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_logging.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/if_ndis/if_ndis.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_ssif.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#21 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwi.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mii/e1000phy.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mii/e1000phyreg.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mii/miidevs#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephyreg.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_raid.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/nvram/nvram.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_disk.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/pci/pci_user.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/random/harvest.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev_soft.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/sequencer.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97_patch.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_zyd.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/uipaq.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_port.h#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/utopia/utopia.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_devs.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_vnops.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/denode.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_fat.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/unionfs/union_subr.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/bde/g_bde.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/bde/g_bde_work.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/geom_io.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/journal/g_journal.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_drive.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_plex.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_volume.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/bios/apm.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/conf/DEFAULTS#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#21 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/conf/PAE#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/in_cksum.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#22 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/msi.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_misc.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/include/bootinfo.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/include/clock.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/include/in_cksum.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/include/pc/bios.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/isa/clock.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#21 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_alq.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_environment.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#21 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#26 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#28 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_idle.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_intr.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_jail.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_kthread.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktrace.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_linker.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_shutdown.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/link_elf.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/link_elf_obj.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sched_ule.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/subr_taskqueue.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sys_pipe.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sys_socket.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#45 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sysv_msg.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sysv_sem.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sysv_shm.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mbuf2.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_sem.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#29 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#43 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/geom/Makefile#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/nvram/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/bpf.h#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/bsd_comp.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if.c#21 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_atmsubr.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_disc.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_fddisubr.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_fwsubr.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_gif.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_iso88025subr.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_lagg.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_loop.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_ppp.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_stf.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/route.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/netatalk/aarp.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/netatalk/ddp_input.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/netatalk/ddp_output.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/netgraph/netgraph.h#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_base.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_socket.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/if_ether.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/igmp.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#21 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_divert.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_icmp.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_input.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_output.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/raw_ip.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_bsd_addr.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/udp_usrreq.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet6/nd6.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet6/udp6_usrreq.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/netsmb/smb_iod.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfs4client/nfs4_vfsops.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_nfsiod.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vfsops.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsock.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/pc98/conf/GENERIC#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/GENERIC#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/genassym.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/swtch.S#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/vm_machdep.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#51 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#30 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#33 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#35 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#47 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_atalk.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_internal.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_net.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_pipe.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_posix_sem.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_process.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_socket.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_system.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_msg.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_sem.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_shm.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_vfs.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_ifoff/mac_ifoff.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_none/mac_none.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_partition/mac_partition.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_portacl/mac_portacl.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_seeotheruids/mac_seeotheruids.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_stub/mac_stub.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/sparc64/isa/isa.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/simdisk.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/apm.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/gpt.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/kthread.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/linker.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/param.h#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/pciio.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/priv.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#28 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/vnode.h#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_vfsops.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_vnops.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_zeroidle.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#14 integrate
.. //depot/projects/trustedbsd/audit3/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init-a.t#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init.t#4 integrate
.. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-copy.t#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-data.t#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-hmac.t#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime-a.t#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime.t#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/awk/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/awk/lib.c.diff#3 delete
.. //depot/projects/trustedbsd/audit3/usr.bin/awk/tran.c.diff#2 delete
.. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#21 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/lex/lib/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/top/machine.c#10 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.8#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.sh#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/devinfo/devinfo.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.8#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.c#13 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pciconf/cap.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/perform.c#8 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/rpcbind.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/traceroute6/traceroute6.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/hostapd/hostapd.8#2 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#21 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
+OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
@@ -579,11 +581,17 @@
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
-OLD_FILES+=usr/lib/libmytinfo_p.a   
+OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfow.a
+OLD_FILES+=usr/lib/libmytinfow.so
+OLD_FILES+=usr/lib/libmytinfow_p.a
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
+OLD_FILES+=usr/lib32/libmytinfow.a
+OLD_FILES+=usr/lib32/libmytinfow.so
+OLD_FILES+=usr/lib32/libmytinfow_p.a
 .endif
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig

==== //depot/projects/trustedbsd/audit3/UPDATING#26 (text+ko) ====

@@ -21,6 +21,27 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071024:
+	It has been decided that it is desirable to provide ABI
+	backwards compatibility to the FreeBSD 4/5/6 versions of the
+	PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was
+	broken with the introduction of PCI domain support (see the
+	20070930 entry). Unfortunately, this required the ABI of
+	PCIOCGETCONF to be broken again in order to be able to
+	provide backwards compatibility to the old version of that
+	IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled
+	again. As for prominent ports this affects neither pciutils
+	nor xorg-server this time, the hal port needs to be rebuilt
+	however.
+
+20071020:
+	The misnamed kthread_create() and friends have been renamed
+	to kproc_create() etc. Many of the callers already
+	used kproc_start()..
+	I will return kthread_create() and friends in a while
+	with implementations that actually create threads, not procs.
+	Renaming corresponds with version 800002.
+
 20071010:
 	RELENG_7 branched.
 
@@ -913,4 +934,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $
+$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $

==== //depot/projects/trustedbsd/audit3/bin/ps/extern.h#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $
+ * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $
  */
 
 struct kinfo;
@@ -39,7 +39,7 @@
 extern int cflag, eval, fscale, nlistread, rawcpu;
 extern unsigned long mempages;
 extern time_t now;
-extern int sumrusage, termwidth, totwidth;
+extern int showthreads, sumrusage, termwidth, totwidth;
 extern STAILQ_HEAD(velisthead, varent) varlist;
 
 __BEGIN_DECLS
@@ -78,6 +78,7 @@
 void	 showkey(void);
 void	 started(KINFO *, VARENT *);
 void	 state(KINFO *, VARENT *);
+void	 tdnam(KINFO *, VARENT *);
 void	 tdev(KINFO *, VARENT *);
 void	 tname(KINFO *, VARENT *);
 void	 ucomm(KINFO *, VARENT *);

==== //depot/projects/trustedbsd/audit3/bin/ps/keyword.c#5 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -186,6 +186,7 @@
 	{"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid),
 		UINT, UIDFMT, 0},
 	{"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0},
+	{"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0},
 	{"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0},
 	{"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT,
 		PIDFMT, 0},

==== //depot/projects/trustedbsd/audit3/bin/ps/print.c#5 (text+ko) ====

@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -129,9 +129,11 @@
 	v = ve->var;
 	if (cflag) {
 		/* If it is the last field, then don't pad */
-		if (STAILQ_NEXT(ve, next_ve) == NULL)
+		if (STAILQ_NEXT(ve, next_ve) == NULL) {
 			(void)printf("%s", k->ki_p->ki_comm);
-		else
+			if (showthreads && k->ki_p->ki_numthreads > 1)
+				printf("/%s", k->ki_p->ki_ocomm);
+		} else
 			(void)printf("%-*s", v->width, k->ki_p->ki_comm);
 		return;
 	}
@@ -178,13 +180,28 @@
 	VAR *v;
 
 	v = ve->var;
-	if (STAILQ_NEXT(ve, next_ve) == NULL)	/* last field, don't pad */
+	if (STAILQ_NEXT(ve, next_ve) == NULL) {	/* last field, don't pad */
 		(void)printf("%s", k->ki_p->ki_comm);
-	else
+		if (showthreads && k->ki_p->ki_numthreads > 1)
+			printf("/%s", k->ki_p->ki_ocomm);
+	} else
 		(void)printf("%-*s", v->width, k->ki_p->ki_comm);
 }
 
 void
+tdnam(KINFO *k, VARENT *ve)
+{
+	VAR *v;
+
+	v = ve->var;
+	if (showthreads && k->ki_p->ki_numthreads > 1)
+		(void)printf("%-*s", v->width, k->ki_p->ki_ocomm);
+        else
+		(void)printf("%-*s", v->width, "      " );
+		
+}
+
+void
 logname(KINFO *k, VARENT *ve)
 {
 	VAR *v;

==== //depot/projects/trustedbsd/audit3/bin/ps/ps.c#5 (text+ko) ====

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -98,6 +98,7 @@
 int	 sumrusage;		/* -S */
 int	 termwidth;		/* Width of the screen (0 == infinity). */
 int	 totwidth;		/* Calculated-width of requested variables. */
+int	 showthreads;		/* will threads be shown? */
 
 struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist);
 
@@ -175,7 +176,7 @@
 	char *cols;
 	int all, ch, elem, flag, _fmt, i, lineno;
 	int nentries, nkept, nselectors;
-	int prtheader, showthreads, wflag, what, xkeep, xkeep_implied;
+	int prtheader, wflag, what, xkeep, xkeep_implied;
 	char errbuf[_POSIX2_LINE_MAX];
 
 	(void) setlocale(LC_ALL, "");

==== //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap.h#6 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.13 2007/10/16 02:07:55 mlaier Exp $
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.14 2007/10/20 20:23:39 mlaier Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.7 2007/06/11 09:52:05 guy Exp $ (LBL)
  */
 
@@ -41,9 +41,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
-#include <pcap-bpf.h>
-#endif
+#include <net/bpf.h>
 
 #include <stdio.h>
 

==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FIXES#4 (text+ko) ====

@@ -25,6 +25,14 @@
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Oct 23, 2007:
+	minor fix in lib.c: increase inputFS to 100, change malloc
+	for fields to n+1.  
+
+	fixed memory fault caused by out of order test in setsval.
+
+	thanks to david o'brien, freebsd, for both fixes.
+
 May 1, 2007:
 	fiddle in makefile to fix for BSD make; thanks to igor sobrado.
 

==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/FREEBSD-upgrade#4 (text+ko) ====

@@ -1,12 +1,12 @@
-# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $
 
 Import of the 2005/04/24 version of the "one true awk", as described
 in "The AWK Programming Language", by Al Aho, Brian Kernighan, and
 Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X).
 
-Original sources were taken from the Brian Kernighan's home page
-(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru
-May 01, 2007.
+Original sources were taken from the Brian Kernighan's AWK page
+http://www.cs.princeton.edu/~bwk/btl.mirror
+and include bug fixes up thru Oct 23, 2007.
 
 The following files were removed for this import:
 
@@ -21,4 +21,4 @@
 
 The vendor import was done by:
 
-	cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501
+	cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023

==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/lib.c#4 (text+ko) ====

@@ -40,7 +40,7 @@
 int	fieldssize = RECSIZE;
 
 Cell	**fldtab;	/* pointers to Cells */
-char	inputFS[10] = " ";
+char	inputFS[100] = " ";
 
 #define	MAXFLD	2
 int	nfields	= MAXFLD;	/* last allocated slot for $i */
@@ -58,7 +58,7 @@
 void recinit(unsigned int n)
 {
 	if ( (record = (char *) malloc(n)) == NULL
-	  || (fields = (char *) malloc(n)) == NULL
+	  || (fields = (char *) malloc(n+1)) == NULL
 	  || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL
 	  || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL )
 		FATAL("out of space for $0 and fields");

==== //depot/projects/trustedbsd/audit3/contrib/one-true-awk/tran.c#3 (text+ko) ====

@@ -332,10 +332,10 @@
 		donerec = 1;
 	}
 	t = tostring(s);	/* in case it's self-assign */
+	if (freeable(vp))
+		xfree(vp->sval);
 	vp->tval &= ~NUM;
 	vp->tval |= STR;
-	if (freeable(vp))
-		xfree(vp->sval);
 	vp->tval &= ~DONTFREE;
 	   dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", 
 		vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) );

==== //depot/projects/trustedbsd/audit3/etc/Makefile#17 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.363 2007/10/18 08:26:20 bushman Exp $
+# $FreeBSD: src/etc/Makefile,v 1.364 2007/10/29 07:37:08 yar Exp $
 
 .include <bsd.own.mk>
 
@@ -78,12 +78,12 @@
 
 afterinstall:
 .if ${MK_MAN} != "no"
-	cd ${.CURDIR}/../share/man; ${MAKE} makedb
+	${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb
 .endif
 
 distribute:
-	cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION}
-	cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
+	${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION}
+	${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
 
 .include <bsd.endian.mk>
 .if ${TARGET_ENDIANNESS} == "1234"
@@ -112,15 +112,15 @@
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
 	    pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 		${DESTDIR}/etc/master.passwd
-	cd ${.CURDIR}/bluetooth; ${MAKE} install
-	cd ${.CURDIR}/defaults; ${MAKE} install
-	cd ${.CURDIR}/gss; ${MAKE} install
-	cd ${.CURDIR}/periodic; ${MAKE} install
-	cd ${.CURDIR}/rc.d; ${MAKE} install
-	cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
-	cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
-	cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
-	cd ${.CURDIR}/pam.d; ${MAKE} install
+	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
+	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
+	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
+	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
+	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
+	${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
+	${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
+	${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
+	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
 	    ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \
@@ -128,7 +128,7 @@
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
 	    ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
 .if ${MK_I4B} != "no"
-	cd ${.CURDIR}/isdn; ${MAKE} install
+	${_+_}cd ${.CURDIR}/isdn; ${MAKE} install
 .endif
 .if ${MK_BIND_MTREE} != "no"
 	@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
@@ -137,10 +137,10 @@
 	fi
 .endif
 .if ${MK_BIND_ETC} != "no"
-	cd ${.CURDIR}/namedb; ${MAKE} install
+	${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
 .endif
 .if ${MK_SENDMAIL} != "no"
-	cd ${.CURDIR}/sendmail; ${MAKE} distribution
+	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
 .if ${MK_OPENSSH} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
@@ -239,7 +239,7 @@
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}/usr/share/examples/etc
-	cd ${.CURDIR}/defaults; ${MAKE} install \
+	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
 	    DESTDIR=${DESTDIR}/usr/share/examples
 
 .include <bsd.prog.mk>

==== //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#20 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $
 
 .include <bsd.own.mk>
 
@@ -25,7 +25,7 @@
 	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
 	named natd netif netoptions \
 	network_ipv6 newsyslog nfsclient nfsd \
-	nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
+	nfsserver nisdomain nsswitch ntpd ntpdate \
 	othermta \
 	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \

==== //depot/projects/trustedbsd/audit3/etc/rc.d/amd#7 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $
 #
 
 # PROVIDE: amd
@@ -34,7 +34,7 @@
 	[Nn][Oo] | '')
 		;;
 	*)
-		rc_flags="${rc_flags} `eval ${amd_map_program}`"
+		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
 		;;
 	esac
 
@@ -46,7 +46,8 @@
 		fi
 		;;
 	*)
-		rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null"
+		rc_flags="-p ${rc_flags}"
+		command_args="> /var/run/amd.pid 2> /dev/null"
 		;;
 	esac
 	return 0

==== //depot/projects/trustedbsd/audit3/etc/rc.d/named#7 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $
 #
 
 # PROVIDE: named
@@ -82,20 +82,28 @@
 
 named_reload()
 {
-	rndc reload
+	${command%/named}/rndc reload
 }
 
 named_stop()
 {
-	echo -n "Stopping named"
-	if rndc stop 2>/dev/null; then
-		echo .
+	# This duplicates an undesirably large amount of code from the stop
+	# routine in rc.subr in order to use rndc to shut down the process,
+	# and to give it a second chance in case rndc fails.
+	rc_pid=$(check_pidfile $pidfile $command)
+	if [ -z "$rc_pid" ]; then
+		[ -n "$rc_fast" ] && return 0
+		_run_rc_notrunning
+		return 1
+	fi
+	echo 'Stopping named.'
+	if ${command%/named}/rndc stop 2>/dev/null; then
+		wait_for_pids $rc_pid
 	else
-		echo -n ": rndc failed, trying killall: "
-		if killall named; then
-			echo .
-		fi
-	fi
+		echo -n 'rndc failed, trying kill: '
+		kill -TERM $rc_pid
+		wait_for_pids $rc_pid
+  	fi
 }
 
 named_poststop()
@@ -121,13 +129,13 @@
 	if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then
 		return 0
 	fi
-	confgen_command="rndc-confgen -a -b256 -u $named_uid \
+	confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
 	    -c ${named_chrootdir}/etc/namedb/rndc.key"
 	if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then
-		if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \
-		    "$named_uid" ]; then
-			$confgen_command
-		fi
+		case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in
+		root|$named_uid) ;;
+		*) $confgen_command ;;
+		esac
 	else
 		$confgen_command
 	fi

==== //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#22 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.241 2007/06/12 09:20:31 philip Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $
 
 %
 =======================================================================
@@ -16494,10 +16494,10 @@
 you through times of no dope.
 		-- Gilbert Shelton

>>> TRUNCATED FOR MAIL (1000 lines) <<<