Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Nov 2007 13:49:23 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 128894 for review
Message-ID:  <200711101349.lAADnN5s053080@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=128894

Change 128894 by rwatson@rwatson_zoo on 2007/11/10 13:49:02

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

Affected files ...

.. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#23 integrate
.. //depot/projects/trustedbsd/audit3/bin/ps/ps.c#6 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/FREEBSD-upgrade#6 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/complete.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/display.c#6 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/input.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/isearch.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/misc.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/text.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/libreadline/vi_mode.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/CACerts#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/INSTALL#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/proto.m4#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/buildvirtuser#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/doc/op/op.me#6 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/editmap/editmap.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/conf.h#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/ldap.h#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/tailq.h#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/engine.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/listener.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/main.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/monitor.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/smfi.c#6 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/ldap.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/mpeix.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/makemap/makemap.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/praliases/praliases.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/Makefile.m4#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.c#8 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/deliver.c#8 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/envelope.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/headers.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/macro.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.c#8 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/milter.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mime.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/parseaddr.c#8 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/readcf.c#6 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/recipient.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.8#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.h#8 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sm_resolve.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/usersmtp.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/util.c#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#9 integrate
.. //depot/projects/trustedbsd/audit3/contrib/sendmail/vacation/vacation.c#5 integrate
.. //depot/projects/trustedbsd/audit3/etc/defaults/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/etc/defaults/pccard.conf#4 delete
.. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.usr.dist#13 integrate
.. //depot/projects/trustedbsd/audit3/etc/network.subr#12 integrate
.. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.mc#7 integrate
.. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.submit.mc#6 integrate
.. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#23 integrate
.. //depot/projects/trustedbsd/audit3/games/fortune/fortune/fortune.6#4 integrate
.. //depot/projects/trustedbsd/audit3/games/fortune/fortune/fortune.c#5 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/locale/mblocal.h#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_spec.c#6 integrate
.. //depot/projects/trustedbsd/audit3/release/Makefile#18 integrate
.. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate
.. //depot/projects/trustedbsd/audit3/release/scripts/package-split.py#7 integrate
.. //depot/projects/trustedbsd/audit3/release/scripts/src-install.sh#4 integrate
.. //depot/projects/trustedbsd/audit3/sbin/mdconfig/mdconfig.8#6 integrate
.. //depot/projects/trustedbsd/audit3/sbin/rcorder/ealloc.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sbin/rcorder/ealloc.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sbin/rcorder/hash.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sbin/rcorder/hash.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sbin/rcorder/rcorder.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sbin/setkey/parse.y#3 integrate
.. //depot/projects/trustedbsd/audit3/sbin/setkey/setkey.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sbin/setkey/test-pfkey.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sbin/setkey/token.l#4 integrate
.. //depot/projects/trustedbsd/audit3/share/doc/legal/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/share/doc/legal/intel_wpi/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#25 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/wpi.4#1 branch
.. //depot/projects/trustedbsd/audit3/share/man/man7/tuning.7#7 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man9/locking.9#5 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man9/rmlock.9#1 branch
.. //depot/projects/trustedbsd/audit3/share/mk/sys.mk#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/conf/NOTES#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/arm/cpufunc.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/ep80219_machdep.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/if_npe.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/common/loader.8#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_ioctl.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_ioctl.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/mutex.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/rwlock.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/pecoff/imgact_pecoff.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/imgact_svr4.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#28 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files#38 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/dev/wpi/LICENSE#1 branch
.. //depot/projects/trustedbsd/audit3/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch
.. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_ec.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/asmc/asmc.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/dev/asmc/asmcvar.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/dev/ciss/ciss.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_sbus.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfe.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ral/rt2560.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ral/rt2661.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/t4dwave.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_rum.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/ukbd.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/wpi/if_wpi.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/dev/wpi/if_wpireg.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/dev/wpi/if_wpivar.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/imgact_coff.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/imgact_linux.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/pmap.c#16 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/imgact_aout.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/imgact_gzip.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#30 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_proc.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_rmlock.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_thr.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#21 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/subr_lock.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/subr_pcpu.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/subr_smp.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/tty_pty.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#26 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/asmc/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/modules/wpi/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/modules/wpifw/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw_pfil.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_indata.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsubs.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/machdep.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/machdep.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/machdep.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/pmap.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/_rmlock.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/sys/lock.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/pcpu.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#29 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/rmlock.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/sys/signalvar.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/smp.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_alloc.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_balloc.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_inode.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_vnops.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_bmap.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_lookup.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_vnops.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/pmap.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_extern.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_kern.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#17 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#25 integrate
.. //depot/projects/trustedbsd/audit3/tools/build/options/makeman#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/du/du.c#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/fstat/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/fstat/fstat.c#8 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/fstat/fstat.h#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/fstat/zfs/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/usr.bin/fstat/zfs/zfs.c#1 branch
.. //depot/projects/trustedbsd/audit3/usr.bin/killall/killall.1#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/killall/killall.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/mail/aux.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/mail/cmd1.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/mail/lex.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/mail/list.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/mail/main.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/mklocale/ldef.h#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/passwd/passwd.1#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/sed/main.c#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/tftp/tftp.1#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/sdpcontrol/search.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/bootparamd/bootparamd/bootparamd.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/bootparamd/bootparamd/main.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/cron.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/cron.h#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/database.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/do_command.c#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/externs.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/cron/crontab/crontab.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/cron/lib/entry.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/crunch/crunchide/crunchide.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/faithd.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/faithd.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/ftp.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/prefix.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/prefix.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/tcp.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/freebsd-update/freebsd-update.sh#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/keyserv/keyserv.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/keyserv/keyserv.h#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/keyserv/setkey.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/lpr/lpd/lpd.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/ndp/ndp.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pccard/pccardc/enabler.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pciconf/pciconf.8#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/add.h#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/main.c#12 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/perform.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/pkg_add.1#8 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/create/main.c#8 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/delete/main.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/main.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/lib.h#10 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/sign/extern.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/sign/gzip.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/sign/pgp.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/sign/stand.h#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/updating/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/updating/main.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/updating/pathnames.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/main.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/version.h#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/auth.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/cbcp.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/ccp.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/chap.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/chap.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/chap_ms.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/chap_ms.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/demand.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/eui64.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/fsm.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/fsm.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/ipcp.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/ipcp.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/ipv6cp.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/ipv6cp.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/ipxcp.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/lcp.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/lcp.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/magic.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/magic.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/main.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/options.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/pppd.h#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/sys-bsd.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/upap.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppd/upap.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pppstats/pppstats.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rip6query/rip6query.c#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/route6d/route6d.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/lockd.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/statd.c#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/check_bound.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/pmap_svc.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/rpcb_svc.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/rpcbind.c#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/rpcbind.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/util.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpcbind/warmstart.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rrenumd/lexer.l#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rrenumd/parser.y#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rrenumd/rrenumd.c#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/advcap.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/advcap.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/config.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/config.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/dump.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/dump.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/if.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/if.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/rrenum.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/rtadvd.c#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/rtadvd.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/timer.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtadvd/timer.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/dump.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/if.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/probe.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/rtsock.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/rtsol.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/rtsold.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/rtsold.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dist.c#10 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dist.h#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/menus.c#14 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/timed/timed/correct.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/timed/timed/extern.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/timed/timed/master.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/timed/timed/networkdelta.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/timed/timed/slave.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/timed/timedc/extern.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/timed/timedc/timedc.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/traceroute6/traceroute6.c#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#6 integrate

Differences ...

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp 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.
 #
 
+# 20071108: Removed very crunch OLDCARD support file
+OLD_FILES+=etc/defaults/pccard.conf
 # 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

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

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -74,6 +74,8 @@
 
 #include "ps.h"
 
+#define	_PATH_PTS	"/dev/pts/"
+
 #define	W_SEP	" \t"		/* "Whitespace" list separators */
 #define	T_SEP	","		/* "Terminate-element" list separators */
 
@@ -706,9 +708,9 @@
 
 /*-
  * The user can specify a device via one of three formats:
- *     1) fully qualified, e.g.:     /dev/ttyp0 /dev/console
- *     2) missing "/dev", e.g.:      ttyp0      console
- *     3) two-letters, e.g.:         p0         co
+ *     1) fully qualified, e.g.:     /dev/ttyp0 /dev/console	/dev/pts/0
+ *     2) missing "/dev", e.g.:      ttyp0      console		pts/0
+ *     3) two-letters, e.g.:         p0         co		0
  *        (matching letters that would be seen in the "TT" column)
  */
 static int
@@ -716,10 +718,11 @@
 {
 	const char *ttypath;
 	struct stat sb;
-	char pathbuf[PATH_MAX], pathbuf2[PATH_MAX];
+	char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX];
 
 	ttypath = NULL;
 	pathbuf2[0] = '\0';
+	pathbuf3[0] = '\0';
 	switch (*elem) {
 	case '/':
 		ttypath = elem;
@@ -736,6 +739,8 @@
 		ttypath = pathbuf;
 		if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0)
 			break;
+		if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0)
+			break;
 		if (strcmp(pathbuf, _PATH_CONSOLE) == 0)
 			break;
 		/* Check to see if /dev/tty${elem} exists */
@@ -746,21 +751,30 @@
 			ttypath = NULL;	
 			break;
 		}
+		/* Check to see if /dev/pts/${elem} exists */
+		strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3));
+		strlcat(pathbuf3, elem, sizeof(pathbuf3));
+		if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) {
+			/* No need to repeat stat() && S_ISCHR() checks */
+			ttypath = NULL;	
+			break;
+		}
 		break;
 	}
 	if (ttypath) {
 		if (stat(ttypath, &sb) == -1) {
-			if (pathbuf2[0] != '\0')
-				warn("%s and %s", pathbuf2, ttypath);
+			if (pathbuf3[0] != '\0')
+				warn("%s, %s, and %s", pathbuf3, pathbuf2,
+				    ttypath);
 			else
 				warn("%s", ttypath);
 			optfatal = 1;
 			return (0);
 		}
 		if (!S_ISCHR(sb.st_mode)) {
-			if (pathbuf2[0] != '\0')
-				warnx("%s and %s: Not a terminal", pathbuf2,
-				    ttypath);
+			if (pathbuf3[0] != '\0')
+				warnx("%s, %s, and %s: Not a terminal",
+				    pathbuf3, pathbuf2, ttypath);
 			else
 				warnx("%s: Not a terminal", ttypath);
 			optfatal = 1;

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/FREEBSD-upgrade#6 (text+ko) ====

@@ -1,7 +1,8 @@
-# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $
 #
 # Official patch 001 imported as v5_2_p1
 # Official patch 002 imported as v5_2_p2
+# Official patches 003-007 imported as v5_2_p3_p7
 #
 
 rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/complete.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */
 /* complete.c -- filename completion for readline. */
 
 /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
@@ -429,7 +429,7 @@
 	return (1);
       if (c == 'n' || c == 'N' || c == RUBOUT)
 	return (0);
-      if (c == ABORT_CHAR)
+      if (c == ABORT_CHAR || c < 0)
 	_rl_abort_internal ();
       if (for_pager && (c == NEWLINE || c == RETURN))
 	return (2);

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/display.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */
 /* display.c -- readline redisplay facility. */
 
 /* Copyright (C) 1987-2006 Free Software Foundation, Inc.
@@ -1519,11 +1519,31 @@
     {
       /* Non-zero if we're increasing the number of lines. */
       int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
+      /* If col_lendiff is > 0, implying that the new string takes up more
+	 screen real estate than the old, but lendiff is < 0, meaning that it
+	 takes fewer bytes, we need to just output the characters starting
+	 from the first difference.  These will overwrite what is on the
+	 display, so there's no reason to do a smart update.  This can really
+	 only happen in a multibyte environment. */
+      if (lendiff < 0)
+	{
+	  _rl_output_some_chars (nfd, temp);
+	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+	  /* If nfd begins before any invisible characters in the prompt,
+	     adjust _rl_last_c_pos to account for wrap_offset and set
+	     cpos_adjusted to let the caller know. */
+	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+	    {
+	      _rl_last_c_pos -= wrap_offset;
+	      cpos_adjusted = 1;
+	    }
+	  return;
+	}
       /* Sometimes it is cheaper to print the characters rather than
 	 use the terminal's capabilities.  If we're growing the number
 	 of lines, make sure we actually cause the new line to wrap
 	 around on auto-wrapping terminals. */
-      if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
+      else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
 	{
 	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
 	     _rl_horizontal_scroll_mode == 1, inserting the characters with
@@ -1599,8 +1619,22 @@
 	  temp = nls - nfd;
 	  if (temp > 0)
 	    {
+	      /* If nfd begins at the prompt, or before the invisible
+		 characters in the prompt, we need to adjust _rl_last_c_pos
+		 in a multibyte locale to account for the wrap offset and
+		 set cpos_adjusted accordingly. */
 	      _rl_output_some_chars (nfd, temp);
-	      _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+		{
+                  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+		    {
+		      _rl_last_c_pos -= wrap_offset;
+		      cpos_adjusted = 1;
+		    }
+		}
+              else
+                _rl_last_c_pos += temp;
 	    }
 	}
       /* Otherwise, print over the existing material. */
@@ -1608,8 +1642,20 @@
 	{
 	  if (temp > 0)
 	    {
+	      /* If nfd begins at the prompt, or before the invisible
+		 characters in the prompt, we need to adjust _rl_last_c_pos
+		 in a multibyte locale to account for the wrap offset and
+		 set cpos_adjusted accordingly. */
 	      _rl_output_some_chars (nfd, temp);
 	      _rl_last_c_pos += col_temp;		/* XXX */
+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+		{
+		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+		    {
+		      _rl_last_c_pos -= wrap_offset;
+		      cpos_adjusted = 1;
+		    }
+		}
 	    }
 	  lendiff = (oe - old) - (ne - new);
 	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
@@ -1745,7 +1791,10 @@
   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
     {
       dpos = _rl_col_width (data, 0, new);
-      if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
+      /* Use NEW when comparing against the last invisible character in the
+	 prompt string, since they're both buffer indices and DPOS is a
+	 desired display position. */
+      if (new > prompt_last_invisible)		/* XXX - don't use woff here */
 	{
 	  dpos -= woff;
 	  /* Since this will be assigned to _rl_last_c_pos at the end (more

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/input.c#5 (text+ko) ====

@@ -133,8 +133,11 @@
     return (0);
 
   *key = ibuffer[pop_index++];
-
+#if 0
   if (pop_index >= ibuffer_len)
+#else
+  if (pop_index > ibuffer_len)
+#endif
     pop_index = 0;
 
   return (1);
@@ -250,7 +253,8 @@
       while (chars_avail--)
 	{
 	  k = (*rl_getc_function) (rl_instream);
-	  rl_stuff_char (k);
+	  if (rl_stuff_char (k) == 0)
+	    break;			/* some problem; no more room */
 	  if (k == NEWLINE || k == RETURN)
 	    break;
 	}
@@ -373,7 +377,11 @@
       RL_SETSTATE (RL_STATE_INPUTPENDING);
     }
   ibuffer[push_index++] = key;
+#if 0
   if (push_index >= ibuffer_len)
+#else
+  if (push_index > ibuffer_len)
+#endif
     push_index = 0;
 
   return 1;
@@ -513,20 +521,26 @@
      char *mbchar;
      int size;
 {
-  int mb_len = 0;
+  int mb_len, c;
   size_t mbchar_bytes_length;
   wchar_t wc;
   mbstate_t ps, ps_back;
 
   memset(&ps, 0, sizeof (mbstate_t));
   memset(&ps_back, 0, sizeof (mbstate_t));
-  
+
+  mb_len = 0;  
   while (mb_len < size)
     {
       RL_SETSTATE(RL_STATE_MOREINPUT);
-      mbchar[mb_len++] = rl_read_key ();
+      c = rl_read_key ();
       RL_UNSETSTATE(RL_STATE_MOREINPUT);
 
+      if (c < 0)
+	break;
+
+      mbchar[mb_len++] = c;
+
       mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
       if (mbchar_bytes_length == (size_t)(-1))
 	break;		/* invalid byte sequence for the current locale */
@@ -564,7 +578,7 @@
 
   c = first;
   memset (mb, 0, mlen);
-  for (i = 0; i < mlen; i++)
+  for (i = 0; c >= 0 && i < mlen; i++)
     {
       mb[i] = (char)c;
       memset (&ps, 0, sizeof (mbstate_t));

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/isearch.c#4 (text+ko) ====

@@ -327,8 +327,15 @@
   rl_command_func_t *f;
 
   f = (rl_command_func_t *)NULL;
- 
- /* Translate the keys we do something with to opcodes. */
+
+  if (c < 0)
+    {
+      cxt->sflags |= SF_FAILED;
+      cxt->history_pos = cxt->last_found_line;
+      return -1;
+    }
+
+  /* Translate the keys we do something with to opcodes. */
   if (c >= 0 && _rl_keymap[c].type == ISFUNC)
     {
       f = _rl_keymap[c].function;

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/misc.c#5 (text+ko) ====

@@ -146,6 +146,8 @@
 	  rl_restore_prompt ();
 	  rl_clear_message ();
 	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
+	  if (key < 0)
+	    return -1;
 	  return (_rl_dispatch (key, _rl_keymap));
 	}
     }

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.c#5 (text+ko) ====

@@ -645,6 +645,11 @@
   if ((cxt->flags & KSEQ_DISPATCHED) == 0)
     {
       nkey = _rl_subseq_getchar (cxt->okey);
+      if (nkey < 0)
+	{
+	  _rl_abort_internal ();
+	  return -1;
+	}
       r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
       cxt->flags |= KSEQ_DISPATCHED;
     }

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/text.c#5 (text+ko) ====

@@ -857,6 +857,9 @@
   c = rl_read_key ();
   RL_UNSETSTATE(RL_STATE_MOREINPUT);
 
+  if (c < 0)
+    return -1;
+
 #if defined (HANDLE_SIGNALS)
   if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
     _rl_restore_tty_signals ();
@@ -1520,6 +1523,9 @@
 
   mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
 
+  if (mb_len <= 0)
+    return -1;
+
   if (count < 0)
     return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
   else
@@ -1536,6 +1542,9 @@
   c = rl_read_key ();
   RL_UNSETSTATE(RL_STATE_MOREINPUT);
 
+  if (c < 0)
+    return -1;
+
   if (count < 0)
     return (_rl_char_search_internal (-count, bdir, c));
   else

==== //depot/projects/trustedbsd/audit3/contrib/libreadline/vi_mode.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.6 2006/12/31 09:22:31 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.7 2007/11/07 04:42:20 ache Exp $ */
 /* vi_mode.c -- A vi emulation mode for Bash.
    Derived from code written by Jeff Sparkes (jsparkes@bnr.ca).  */
 
@@ -887,6 +887,13 @@
   RL_SETSTATE(RL_STATE_MOREINPUT);
   c = rl_read_key ();
   RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+  if (c < 0)
+    {
+      *nextkey = 0;
+      return -1;
+    }
+
   *nextkey = c;
 
   if (!member (c, vi_motion))
@@ -903,6 +910,11 @@
 	  RL_SETSTATE(RL_STATE_MOREINPUT);
 	  c = rl_read_key ();	/* real command */
 	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+	  if (c < 0)
+	    {
+	      *nextkey = 0;
+	      return -1;
+	    }
 	  *nextkey = c;
 	}
       else if (key == c && (key == 'd' || key == 'y' || key == 'c'))
@@ -1225,14 +1237,22 @@
 _rl_vi_callback_char_search (data)
      _rl_callback_generic_arg *data;
 {
+  int c;
 #if defined (HANDLE_MULTIBYTE)
-  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+  c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
 #else
   RL_SETSTATE(RL_STATE_MOREINPUT);
-  _rl_vi_last_search_char = rl_read_key ();
+  c = rl_read_key ();
   RL_UNSETSTATE(RL_STATE_MOREINPUT);
 #endif
 
+  if (c <= 0)
+    return -1;
+
+#if !defined (HANDLE_MULTIBYTE)
+  _rl_vi_last_search_char = c;
+#endif
+
   _rl_callback_func = 0;
   _rl_want_redisplay = 1;
 
@@ -1248,6 +1268,7 @@
 rl_vi_char_search (count, key)
      int count, key;
 {
+  int c;
 #if defined (HANDLE_MULTIBYTE)
   static char *target;
   static int tlen;
@@ -1294,11 +1315,17 @@
       else
 	{
 #if defined (HANDLE_MULTIBYTE)
-	  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+	  c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+	  if (c <= 0)
+	    return -1;
+	  _rl_vi_last_search_mblen = c;
 #else
 	  RL_SETSTATE(RL_STATE_MOREINPUT);
-	  _rl_vi_last_search_char = rl_read_key ();
+	  c = rl_read_key ();
 	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+	  if (c < 0)
+	    return -1;
+	  _rl_vi_last_search_char = c;
 #endif
 	}
     }
@@ -1468,6 +1495,9 @@
   c = rl_read_key ();
   RL_UNSETSTATE(RL_STATE_MOREINPUT);
 
+  if (c < 0)
+    return -1;
+
 #if defined (HANDLE_MULTIBYTE)
   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
     c = _rl_read_mbstring (c, mb, mlen);
@@ -1486,6 +1516,9 @@
 
   _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
 
+  if (c < 0)
+    return -1;
+
   _rl_callback_func = 0;
   _rl_want_redisplay = 1;
 
@@ -1517,6 +1550,9 @@
   else
     _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
 
+  if (c < 0)
+    return -1;
+
   return (_rl_vi_change_char (count, c, mb));
 }
 
@@ -1651,7 +1687,7 @@
   ch = rl_read_key ();
   RL_UNSETSTATE(RL_STATE_MOREINPUT);
 
-  if (ch < 'a' || ch > 'z')
+  if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
     {
       rl_ding ();
       return -1;
@@ -1703,7 +1739,7 @@
       rl_point = rl_mark;
       return 0;
     }
-  else if (ch < 'a' || ch > 'z')
+  else if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
     {
       rl_ding ();
       return -1;

==== //depot/projects/trustedbsd/audit3/contrib/sendmail/CACerts#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $Id: CACerts,v 8.1 2004/03/01 22:05:47 ca Exp $
+# $Id: CACerts,v 8.3 2007/06/11 22:04:46 ca Exp $
 # This file contains some CA certificates that are used to sign the
 # certificates of mail servers of members of the sendmail consortium
 # who may reply to questions etc sent to sendmail.org.
@@ -78,73 +78,6 @@
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-        Validity
-            Not Before: Jan  1 04:39:54 2002 GMT
-            Not After : Dec 31 04:39:54 2006 GMT
-        Subject: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:aa:dd:a2:fe:3b:fa:2f:5c:3d:f1:e1:d4:1d:55:
-                    04:27:6b:01:62:00:d7:02:cb:74:47:69:84:d7:c6:
-                    c5:71:55:79:35:3a:a8:ce:de:48:23:53:80:3c:cd:
-                    54:2e:e9:fe:b1:76:5a:be:cb:fd:2d:dc:a3:36:c5:
-                    c7:1e:4e:ef:76:f0:55:8f:a0:a5:f8:07:c5:52:1d:
-                    a2:42:81:4d:8a:c8:42:3f:f3:01:80:f9:46:35:a6:
-                    bc:c0:9b:9f:33:8b:49:9b:1d:87:8f:19:48:15:21:
-                    23:57:df:6e:4d:03:ed:ae:9f:0b:91:b7:a9:47:66:
-                    f1:0d:1b:1c:5d:b4:57:60:c7
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-            A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA
-            X509v3 Authority Key Identifier: 
-            keyid:A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA
-            DirName:/C=US/ST=California/L=Emeryville/O=gshapiro.net/CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-            serial:00
-
-            X509v3 Basic Constraints: 
-            CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        87:27:d2:2a:3a:dc:04:cd:ef:e8:7b:1c:34:47:2e:13:34:a5:
-        08:f9:4d:df:d8:e1:6d:e6:9a:db:38:ee:20:6d:4a:ae:6f:1e:
-        bc:71:61:a4:b4:d6:40:24:ee:65:ca:e9:81:5a:ef:ee:62:57:
-        70:05:46:91:6b:d0:c6:a6:e9:38:65:ae:ea:50:b3:5c:27:c4:
-        7a:bd:95:8c:cb:45:ef:fc:fc:99:e5:6a:61:c3:44:77:d8:1f:
-        d6:b4:17:44:15:9a:bc:26:5b:ec:4e:29:5d:fd:cf:61:f3:be:
-        91:a4:3b:51:e6:73:5b:17:82:9d:5a:56:2c:63:c2:f1:d6:a2:
-        4c:5a
------BEGIN CERTIFICATE-----
-MIIDoTCCAwqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExEzARBgNVBAcTCkVtZXJ5dmlsbGUxFTATBgNV
-BAoTDGdzaGFwaXJvLm5ldDEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MSgwJgYJKoZIhvcNAQkBFhljZXJ0aWZpY2F0ZXNAZ3NoYXBpcm8ubmV0MB4XDTAy
-MDEwMTA0Mzk1NFoXDTA2MTIzMTA0Mzk1NFowgZgxCzAJBgNVBAYTAlVTMRMwEQYD
-VQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxlMRUwEwYDVQQKEwxn
-c2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEoMCYG
-CSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5ldDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAqt2i/jv6L1w98eHUHVUEJ2sBYgDXAst0R2mE18bF
-cVV5NTqozt5II1OAPM1ULun+sXZavsv9LdyjNsXHHk7vdvBVj6Cl+AfFUh2iQoFN
-ishCP/MBgPlGNaa8wJufM4tJmx2HjxlIFSEjV99uTQPtrp8LkbepR2bxDRscXbRX
-YMcCAwEAAaOB+DCB9TAdBgNVHQ4EFgQUoG3gBq9hlLTGhBW0i3QiZ0pDYMowgcUG
-A1UdIwSBvTCBuoAUoG3gBq9hlLTGhBW0i3QiZ0pDYMqhgZ6kgZswgZgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxl
-MRUwEwYDVQQKEwxnc2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1
-dGhvcml0eTEoMCYGCSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5l
-dIIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAIcn0io63ATN7+h7
-HDRHLhM0pQj5Td/Y4W3mmts47iBtSq5vHrxxYaS01kAk7mXK6YFa7+5iV3AFRpFr
-0Mam6ThlrupQs1wnxHq9lYzLRe/8/JnlamHDRHfYH9a0F0QVmrwmW+xOKV39z2Hz
-vpGkO1Hmc1sXgp1aVixjwvHWokxa
------END CERTIFICATE-----
-
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-        Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rickert@cs.niu.edu
         Validity
             Not Before: May 12 00:40:50 2000 GMT
@@ -210,93 +143,94 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 0 (0x0)
+        Serial Number:
+            fa:7c:2c:80:29:3f:c2:64
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
+        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org
         Validity
-            Not Before: Aug  7 15:56:45 2003 GMT
-            Not After : Aug  6 15:56:45 2006 GMT
-        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
+            Not Before: May  4 02:07:56 2007 GMT
+            Not After : May  3 02:07:56 2010 GMT
+        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:aa:37:0f:09:a9:1c:e3:1a:0c:fe:bd:6c:37:a4:
-                    cf:87:db:af:6b:b4:19:d4:11:db:c6:56:ca:39:80:
-                    c6:a4:38:b0:bc:ac:7e:be:71:30:86:2c:dc:fa:b5:
-                    fd:58:23:a0:c1:ad:11:53:85:ca:fb:e6:d8:7e:28:
-                    eb:84:3b:cd:a3:fa:28:a5:cb:c7:b2:54:99:3e:40:
-                    2a:27:43:4b:0c:26:4b:af:97:3d:92:82:d9:eb:2c:
-                    7f:77:fd:b8:cd:7e:1e:04:81:17:3c:e2:44:68:ce:

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711101349.lAADnN5s053080>