PERFORCE change 149122 for review

Sam Leffler sam at FreeBSD.org
Wed Sep 3 16:02:20 UTC 2008


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

Change 149122 by sam at sam_ebb on 2008/09/03 16:01:51

	IFC @ 149120

Affected files ...

.. //depot/projects/vap/ObsoleteFiles.inc#17 integrate
.. //depot/projects/vap/UPDATING#18 integrate
.. //depot/projects/vap/bin/Makefile#4 integrate
.. //depot/projects/vap/bin/pkill/Makefile#1 branch
.. //depot/projects/vap/bin/pkill/pkill.1#1 branch
.. //depot/projects/vap/bin/pkill/pkill.c#1 branch
.. //depot/projects/vap/bin/sh/options.c#4 integrate
.. //depot/projects/vap/bin/sh/sh.1#4 integrate
.. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate
.. //depot/projects/vap/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/vap/contrib/bind9/COPYRIGHT#4 integrate
.. //depot/projects/vap/contrib/bind9/bin/dig/dighost.c#4 integrate
.. //depot/projects/vap/contrib/bind9/bin/named/client.c#5 integrate
.. //depot/projects/vap/contrib/bind9/bin/named/config.c#4 integrate
.. //depot/projects/vap/contrib/bind9/bin/named/controlconf.c#3 integrate
.. //depot/projects/vap/contrib/bind9/bin/named/interfacemgr.c#3 integrate
.. //depot/projects/vap/contrib/bind9/bin/named/lwresd.c#3 integrate
.. //depot/projects/vap/contrib/bind9/bin/named/named.conf.docbook#4 integrate
.. //depot/projects/vap/contrib/bind9/bin/named/server.c#5 integrate
.. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.c#3 integrate
.. //depot/projects/vap/contrib/bind9/configure.in#4 integrate
.. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate
.. //depot/projects/vap/contrib/bind9/lib/bind/configure.in#4 integrate
.. //depot/projects/vap/contrib/bind9/lib/bind9/check.c#5 integrate
.. //depot/projects/vap/contrib/bind9/lib/dns/api#5 integrate
.. //depot/projects/vap/contrib/bind9/lib/dns/dispatch.c#5 integrate
.. //depot/projects/vap/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate
.. //depot/projects/vap/contrib/bind9/lib/dns/request.c#3 integrate
.. //depot/projects/vap/contrib/bind9/lib/dns/resolver.c#5 integrate
.. //depot/projects/vap/contrib/bind9/lib/dns/xfrin.c#4 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/api#4 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/timer.c#4 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/unix/app.c#3 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/unix/resource.c#3 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/unix/socket.c#4 integrate
.. //depot/projects/vap/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate
.. //depot/projects/vap/contrib/bind9/lib/isccfg/api#4 integrate
.. //depot/projects/vap/contrib/bind9/lib/isccfg/namedconf.c#3 integrate
.. //depot/projects/vap/contrib/bind9/version#5 integrate
.. //depot/projects/vap/contrib/gcc/config/freebsd-spec.h#3 integrate
.. //depot/projects/vap/contrib/gcc/config/freebsd.h#3 integrate
.. //depot/projects/vap/contrib/gcc/config/i386/freebsd64.h#3 integrate
.. //depot/projects/vap/contrib/gcc/config/mips/freebsd.h#1 branch
.. //depot/projects/vap/contrib/gdtoa/README#3 integrate
.. //depot/projects/vap/contrib/gdtoa/dtoa.c#3 integrate
.. //depot/projects/vap/contrib/gdtoa/gdtoa.h#3 integrate
.. //depot/projects/vap/contrib/gdtoa/gdtoaimp.h#4 integrate
.. //depot/projects/vap/contrib/gdtoa/gethex.c#4 integrate
.. //depot/projects/vap/contrib/gdtoa/strtoIg.c#3 integrate
.. //depot/projects/vap/contrib/gdtoa/strtod.c#4 integrate
.. //depot/projects/vap/contrib/gdtoa/strtodg.c#3 integrate
.. //depot/projects/vap/contrib/gdtoa/strtof.c#4 integrate
.. //depot/projects/vap/contrib/gdtoa/test/README#3 integrate
.. //depot/projects/vap/contrib/gdtoa/test/f.out#3 integrate
.. //depot/projects/vap/contrib/gdtoa/test/getround.c#3 integrate
.. //depot/projects/vap/contrib/gdtoa/test/xsum0.out#3 integrate
.. //depot/projects/vap/contrib/gdtoa/xsum0.out#3 integrate
.. //depot/projects/vap/contrib/sendmail/FREEBSD-upgrade#3 integrate
.. //depot/projects/vap/contrib/sendmail/KNOWNBUGS#3 integrate
.. //depot/projects/vap/contrib/sendmail/PGPKEYS#3 integrate
.. //depot/projects/vap/contrib/sendmail/README#3 integrate
.. //depot/projects/vap/contrib/sendmail/RELEASE_NOTES#3 integrate
.. //depot/projects/vap/contrib/sendmail/cf/README#3 integrate
.. //depot/projects/vap/contrib/sendmail/cf/cf/submit.cf#3 integrate
.. //depot/projects/vap/contrib/sendmail/cf/m4/proto.m4#3 integrate
.. //depot/projects/vap/contrib/sendmail/cf/m4/version.m4#3 integrate
.. //depot/projects/vap/contrib/sendmail/include/libmilter/mfapi.h#3 integrate
.. //depot/projects/vap/contrib/sendmail/libmilter/Makefile.m4#3 integrate
.. //depot/projects/vap/contrib/sendmail/libmilter/docs/smfi_opensocket.html#3 integrate
.. //depot/projects/vap/contrib/sendmail/libmilter/docs/smfi_version.html#3 integrate
.. //depot/projects/vap/contrib/sendmail/libmilter/engine.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/libmilter/main.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/libmilter/worker.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/mail.local/mail.local.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/makemap/makemap.8#3 integrate
.. //depot/projects/vap/contrib/sendmail/makemap/makemap.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/smrsh/README#3 integrate
.. //depot/projects/vap/contrib/sendmail/smrsh/smrsh.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/Makefile.m4#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/README#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/collect.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/conf.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/conf.h#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/daemon.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/envelope.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/err.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/headers.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/mailq.1#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/main.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/mci.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/parseaddr.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/queue.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/ratectrl.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/readcf.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/savemail.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/sendmail.h#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/sfsasl.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/sm_resolve.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/srvrsmtp.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/usersmtp.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/util.c#3 integrate
.. //depot/projects/vap/contrib/sendmail/src/version.c#3 integrate
.. //depot/projects/vap/contrib/telnet/telnetd/telnetd.8#3 integrate
.. //depot/projects/vap/crypto/openssh/config.h#4 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/fake-queue.h#3 delete
.. //depot/projects/vap/crypto/openssh/openbsd-compat/tree.h#3 delete
.. //depot/projects/vap/etc/defaults/rc.conf#20 integrate
.. //depot/projects/vap/etc/rc.d/savecore#6 integrate
.. //depot/projects/vap/etc/sendmail/freebsd.mc#4 integrate
.. //depot/projects/vap/etc/sendmail/freebsd.submit.mc#3 integrate
.. //depot/projects/vap/gnu/lib/libgcc/Makefile#4 integrate
.. //depot/projects/vap/gnu/lib/libgomp/Makefile#3 integrate
.. //depot/projects/vap/gnu/lib/libgomp/config.h#3 integrate
.. //depot/projects/vap/gnu/usr.bin/Makefile#6 integrate
.. //depot/projects/vap/gnu/usr.bin/binutils/libbfd/Makefile.amd64#3 integrate
.. //depot/projects/vap/gnu/usr.bin/cc/Makefile.tgt#3 integrate
.. //depot/projects/vap/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch
.. //depot/projects/vap/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#3 delete
.. //depot/projects/vap/lib/bind/config.h#4 integrate
.. //depot/projects/vap/lib/libarchive/Makefile#10 integrate
.. //depot/projects/vap/lib/libarchive/archive.h#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry.c#7 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry.h#6 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry_private.h#6 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_disk.c#12 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_by_name.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_mtree.c#1 branch
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_shar.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/main.c#8 integrate
.. //depot/projects/vap/lib/libarchive/test/read_open_memory.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_acl_basic.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_acl_pax.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_bad_fd.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_compat_gtar.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_compat_zip.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_empty_write.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_entry.c#6 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_compress_program.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_data_large.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_extract.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_ar.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin_Z.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin_gz.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_odc.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_empty.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_gz.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse.c#5 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_iso_gz.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_mtree.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_pax_bz2.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_tar.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_tbz.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_tgz.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_tz.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#6 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_large.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_pax_truncated.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_position.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_truncated.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_tar_filenames.c#5 integrate
.. //depot/projects/vap/lib/libarchive/test/test_tar_large.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_compress.c#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_compress_program.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#5 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk_perms.c#5 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk_secure.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_ar.c#5 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_newc.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_shar_empty.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_tar.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_open_memory.c#3 integrate
.. //depot/projects/vap/lib/libc/include/libc_private.h#5 integrate
.. //depot/projects/vap/lib/libc/stdlib/Symbol.map#5 integrate
.. //depot/projects/vap/lib/libc/stdlib/malloc.3#5 integrate
.. //depot/projects/vap/lib/libc/stdlib/malloc.c#14 integrate
.. //depot/projects/vap/lib/libpcap/Makefile#3 integrate
.. //depot/projects/vap/lib/libstand/mips/_setjmp.S#1 branch
.. //depot/projects/vap/lib/libthr/thread/thr_exit.c#9 integrate
.. //depot/projects/vap/lib/libthread_db/arch/mips/libpthread_md.c#1 branch
.. //depot/projects/vap/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/vap/rescue/rescue/Makefile#7 integrate
.. //depot/projects/vap/sbin/geom/class/eli/geli.8#4 integrate
.. //depot/projects/vap/sbin/geom/class/eli/geom_eli.c#4 integrate
.. //depot/projects/vap/sbin/gpt/Makefile#3 delete
.. //depot/projects/vap/sbin/gpt/add.c#3 delete
.. //depot/projects/vap/sbin/gpt/boot.c#3 delete
.. //depot/projects/vap/sbin/gpt/create.c#3 delete
.. //depot/projects/vap/sbin/gpt/destroy.c#3 delete
.. //depot/projects/vap/sbin/gpt/gpt.8#4 delete
.. //depot/projects/vap/sbin/gpt/gpt.c#5 delete
.. //depot/projects/vap/sbin/gpt/gpt.h#3 delete
.. //depot/projects/vap/sbin/gpt/label.c#3 delete
.. //depot/projects/vap/sbin/gpt/map.c#3 delete
.. //depot/projects/vap/sbin/gpt/map.h#3 delete
.. //depot/projects/vap/sbin/gpt/migrate.c#4 delete
.. //depot/projects/vap/sbin/gpt/recover.c#3 delete
.. //depot/projects/vap/sbin/gpt/remove.c#3 delete
.. //depot/projects/vap/sbin/gpt/show.c#4 delete
.. //depot/projects/vap/sbin/ifconfig/ifconfig.8#16 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.c#11 integrate
.. //depot/projects/vap/sbin/ifconfig/ifvlan.c#7 integrate
.. //depot/projects/vap/sbin/ipfw/ipfw.8#8 integrate
.. //depot/projects/vap/sbin/md5/md5.c#4 integrate
.. //depot/projects/vap/sbin/mount/mount.c#5 integrate
.. //depot/projects/vap/sbin/ping6/ping6.8#5 integrate
.. //depot/projects/vap/sbin/ping6/ping6.c#6 integrate
.. //depot/projects/vap/share/man/man4/wi.4#8 integrate
.. //depot/projects/vap/share/man/man4/witness.4#3 integrate
.. //depot/projects/vap/share/man/man9/Makefile#12 integrate
.. //depot/projects/vap/share/man/man9/VOP_ATTRIB.9#3 integrate
.. //depot/projects/vap/share/man/man9/vfs_busy.9#3 integrate
.. //depot/projects/vap/share/man/man9/vfs_unbusy.9#3 integrate
.. //depot/projects/vap/sys/amd64/amd64/cpu_switch.S#7 integrate
.. //depot/projects/vap/sys/amd64/amd64/machdep.c#13 integrate
.. //depot/projects/vap/sys/amd64/ia32/ia32_signal.c#8 integrate
.. //depot/projects/vap/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/vap/sys/boot/sparc64/loader/main.c#7 integrate
.. //depot/projects/vap/sys/boot/uboot/common/main.c#4 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/Makefile#4 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/console.c#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/elf_freebsd.c#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/glue.h#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/net.c#4 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/reboot.c#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/time.c#3 integrate
.. //depot/projects/vap/sys/cam/scsi/scsi_da.c#8 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpuvar.h#4 integrate
.. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate
.. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#9 integrate
.. //depot/projects/vap/sys/compat/linux/linux_getcwd.c#7 integrate
.. //depot/projects/vap/sys/compat/linux/linux_misc.c#15 integrate
.. //depot/projects/vap/sys/compat/ndis/subr_ndis.c#10 integrate
.. //depot/projects/vap/sys/compat/svr4/svr4_fcntl.c#9 integrate
.. //depot/projects/vap/sys/conf/files.mips#2 integrate
.. //depot/projects/vap/sys/conf/options#27 edit
.. //depot/projects/vap/sys/contrib/dev/ath/COPYRIGHT#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/README#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/ah_desc.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/ah_devid.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/ah_soc.h#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap30.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap30.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap43.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap43.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap51.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap51.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap61.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap61.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.inc#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/wackelf.c#4 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.inc#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#6 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/version.h#6 integrate
.. //depot/projects/vap/sys/dev/bce/if_bce.c#9 integrate
.. //depot/projects/vap/sys/dev/bce/if_bcereg.h#6 integrate
.. //depot/projects/vap/sys/dev/bm/if_bm.c#3 integrate
.. //depot/projects/vap/sys/dev/ciss/ciss.c#12 integrate
.. //depot/projects/vap/sys/dev/ciss/cissreg.h#8 integrate
.. //depot/projects/vap/sys/dev/cpuctl/cpuctl.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_ioctl.h#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#12 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#10 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate
.. //depot/projects/vap/sys/dev/dc/if_dc.c#6 integrate
.. //depot/projects/vap/sys/dev/dc/if_dcreg.h#4 integrate
.. //depot/projects/vap/sys/dev/drm/drm_drv.c#7 integrate
.. //depot/projects/vap/sys/dev/drm/drm_lock.c#6 integrate
.. //depot/projects/vap/sys/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/vap/sys/dev/e1000/if_igb.h#2 integrate
.. //depot/projects/vap/sys/dev/ex/if_ex_pccard.c#7 integrate
.. //depot/projects/vap/sys/dev/ic/ns16550.h#5 integrate
.. //depot/projects/vap/sys/dev/ipmi/ipmi.c#3 integrate
.. //depot/projects/vap/sys/dev/ipmi/ipmi_kcs.c#3 integrate
.. //depot/projects/vap/sys/dev/ipmi/ipmivars.h#3 integrate
.. //depot/projects/vap/sys/dev/k8temp/k8temp.c#7 integrate
.. //depot/projects/vap/sys/dev/md/md.c#9 integrate
.. //depot/projects/vap/sys/dev/pccard/pccard_cis.c#7 integrate
.. //depot/projects/vap/sys/dev/pccard/pccarddevs#10 integrate
.. //depot/projects/vap/sys/dev/pci/pci_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/ppc/ppc_isa.c#4 integrate
.. //depot/projects/vap/sys/dev/syscons/syscons.c#12 integrate
.. //depot/projects/vap/sys/dev/usb/ehci_pci.c#11 integrate
.. //depot/projects/vap/sys/dev/usb/ohci_pci.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/ufoma.c#4 integrate
.. //depot/projects/vap/sys/dev/usb/uhci_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/usb/uipaq.c#8 integrate
.. //depot/projects/vap/sys/dev/usb/umodem.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/uplcom.c#8 integrate
.. //depot/projects/vap/sys/dev/usb/uvscom.c#6 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi_pccard.c#9 integrate
.. //depot/projects/vap/sys/dev/xen/blkback/blkback.c#2 integrate
.. //depot/projects/vap/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/vap/sys/fs/coda/coda_venus.c#4 integrate
.. //depot/projects/vap/sys/fs/coda/coda_venus.h#4 integrate
.. //depot/projects/vap/sys/fs/coda/coda_vnops.c#6 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#13 integrate
.. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#10 integrate
.. //depot/projects/vap/sys/fs/hpfs/hpfs_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/msdosfs/msdosfs_fat.c#5 integrate
.. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate
.. //depot/projects/vap/sys/fs/nwfs/nwfs_io.c#6 integrate
.. //depot/projects/vap/sys/fs/nwfs/nwfs_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/portalfs/portal_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/smbfs/smbfs_io.c#8 integrate
.. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#11 integrate
.. //depot/projects/vap/sys/fs/smbfs/smbfs_vnops.c#9 integrate
.. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate
.. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/unionfs/union_subr.c#11 integrate
.. //depot/projects/vap/sys/fs/unionfs/union_vfsops.c#9 integrate
.. //depot/projects/vap/sys/fs/unionfs/union_vnops.c#9 integrate
.. //depot/projects/vap/sys/geom/journal/g_journal.c#4 integrate
.. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate
.. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate
.. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate
.. //depot/projects/vap/sys/i386/cpufreq/powernow.c#6 integrate
.. //depot/projects/vap/sys/i386/cpufreq/smist.c#6 integrate
.. //depot/projects/vap/sys/i386/ibcs2/imgact_coff.c#8 integrate
.. //depot/projects/vap/sys/i386/xen/locore.s#3 integrate
.. //depot/projects/vap/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/vap/sys/kern/imgact_shell.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_exec.c#14 integrate
.. //depot/projects/vap/sys/kern/kern_exit.c#12 integrate
.. //depot/projects/vap/sys/kern/kern_linker.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_mib.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_sig.c#13 integrate
.. //depot/projects/vap/sys/kern/kern_subr.c#6 integrate
.. //depot/projects/vap/sys/kern/subr_smp.c#11 integrate
.. //depot/projects/vap/sys/kern/subr_witness.c#17 integrate
.. //depot/projects/vap/sys/kern/tty.c#12 integrate
.. //depot/projects/vap/sys/kern/tty_inq.c#2 integrate
.. //depot/projects/vap/sys/kern/tty_outq.c#2 integrate
.. //depot/projects/vap/sys/kern/tty_ttydisc.c#2 integrate
.. //depot/projects/vap/sys/kern/uipc_mqueue.c#5 integrate
.. //depot/projects/vap/sys/kern/uipc_socket.c#14 integrate
.. //depot/projects/vap/sys/kern/vfs_default.c#12 integrate
.. //depot/projects/vap/sys/kern/vfs_lookup.c#11 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#20 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#22 integrate
.. //depot/projects/vap/sys/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/vap/sys/kern/vfs_vnops.c#10 integrate
.. //depot/projects/vap/sys/kern/vnode_if.src#9 integrate
.. //depot/projects/vap/sys/modules/aha/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/ahb/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/an/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/ar/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#8 integrate
.. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#8 integrate
.. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#9 integrate
.. //depot/projects/vap/sys/modules/ce/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/cp/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/ctau/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/cx/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/digi/digi/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/fatm/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/hatm/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/hifn/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/if_tap/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/linux/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/netgraph/sync_ar/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/netgraph/sync_sr/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/patm/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/pf/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/pflog/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/rp/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/safe/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/sppp/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/sr/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/svr4/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/trm/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/ubsec/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/usb/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/wi/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/wlan/Makefile#11 integrate
.. //depot/projects/vap/sys/modules/wlan_acl/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/wlan_amrr/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/wlan_ccmp/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/wlan_rssadapt/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/wlan_tkip/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/wlan_wep/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/wlan_xauth/Makefile#5 integrate
.. //depot/projects/vap/sys/net/bpf.c#20 integrate
.. //depot/projects/vap/sys/net/bpf_filter.c#8 integrate
.. //depot/projects/vap/sys/net/bpf_jitter.c#4 integrate
.. //depot/projects/vap/sys/net/ethernet.h#6 integrate
.. //depot/projects/vap/sys/net/if.h#9 integrate
.. //depot/projects/vap/sys/net/if_ethersubr.c#11 integrate
.. //depot/projects/vap/sys/net/if_vlan.c#11 integrate
.. //depot/projects/vap/sys/net/route.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211.c#49 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#16 integrate
.. //depot/projects/vap/sys/netgraph/ng_bpf.c#7 integrate
.. //depot/projects/vap/sys/netinet/if_ether.c#10 integrate
.. //depot/projects/vap/sys/netinet/ip_options.c#7 integrate
.. //depot/projects/vap/sys/netinet/libalias/alias_db.c#8 integrate
.. //depot/projects/vap/sys/netinet/sctp_indata.c#8 integrate
.. //depot/projects/vap/sys/netinet/sctp_lock_bsd.h#5 integrate
.. //depot/projects/vap/sys/netinet/sctp_output.c#12 integrate
.. //depot/projects/vap/sys/netinet/sctp_pcb.c#11 integrate
.. //depot/projects/vap/sys/netinet/sctp_sysctl.h#6 integrate
.. //depot/projects/vap/sys/netinet/sctp_timer.c#7 integrate
.. //depot/projects/vap/sys/netinet/sctp_timer.h#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_var.h#9 integrate
.. //depot/projects/vap/sys/netinet/sctputil.c#11 integrate
.. //depot/projects/vap/sys/netinet/tcp_hostcache.c#6 integrate
.. //depot/projects/vap/sys/netinet/tcp_offload.c#4 integrate
.. //depot/projects/vap/sys/netinet/toedev.h#3 integrate
.. //depot/projects/vap/sys/netinet6/mld6.c#8 integrate
.. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#13 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_bio.c#7 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#16 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#15 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_serv.c#11 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#9 integrate
.. //depot/projects/vap/sys/powerpc/aim/clock.c#5 integrate
.. //depot/projects/vap/sys/powerpc/aim/interrupt.c#2 integrate
.. //depot/projects/vap/sys/powerpc/aim/machdep.c#10 integrate
.. //depot/projects/vap/sys/powerpc/aim/mmu_oea.c#5 integrate
.. //depot/projects/vap/sys/powerpc/aim/vm_machdep.c#5 integrate
.. //depot/projects/vap/sys/powerpc/booke/pmap.c#6 integrate
.. //depot/projects/vap/sys/powerpc/include/cpufunc.h#5 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/db_interface.c#5 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate
.. //depot/projects/vap/sys/security/audit/audit_arg.c#10 integrate
.. //depot/projects/vap/sys/security/audit/audit_worker.c#12 integrate
.. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#9 integrate
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#18 integrate
.. //depot/projects/vap/sys/sparc64/include/cache.h#6 integrate
.. //depot/projects/vap/sys/sparc64/include/pcpu.h#8 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/autoconf.c#7 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/cache.c#4 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/cheetah.c#5 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/genassym.c#6 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/machdep.c#9 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/mp_exception.S#5 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#11 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/spitfire.c#5 integrate
.. //depot/projects/vap/sys/sun4v/sun4v/clock.c#1 branch
.. //depot/projects/vap/sys/sys/ioccom.h#5 integrate
.. //depot/projects/vap/sys/sys/mount.h#9 integrate
.. //depot/projects/vap/sys/sys/ttydisc.h#2 integrate
.. //depot/projects/vap/sys/sys/ttyqueue.h#2 integrate
.. //depot/projects/vap/sys/sys/vnode.h#14 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_alloc.c#6 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_extern.h#6 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#10 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#12 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#16 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#12 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_extattr.c#9 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_vfsops.c#6 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_vnops.c#10 integrate
.. //depot/projects/vap/sys/vm/swap_pager.c#10 integrate
.. //depot/projects/vap/sys/vm/vm_mmap.c#13 integrate
.. //depot/projects/vap/sys/vm/vnode_pager.c#10 integrate
.. //depot/projects/vap/tools/regression/atm/README#3 integrate
.. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts2.0#1 branch
.. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts2.0.stdout#1 branch
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/Makefile#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0001.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0002.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0003.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0004.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0005.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0006.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0007.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0008.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0009.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0010.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0011.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0012.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0013.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0014.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0015.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0016.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0017.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0018.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0019.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0020.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0021.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0022.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0023.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0024.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0025.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0026.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0027.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0028.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0029.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0030.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0031.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0032.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0033.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0034.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0035.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0036.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0037.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0038.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0039.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0040.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0041.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0042.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0043.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0044.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0045.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0046.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0047.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0048.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0049.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0050.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0051.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0052.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0053.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0054.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0055.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0056.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0057.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0058.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0059.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0060.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0061.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0062.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0063.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0064.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0065.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0066.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0067.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0068.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0069.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0070.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0071.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0072.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0073.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0074.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0079.h#2 integrate
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0080.h#1 branch
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0081.h#1 branch
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0082.h#1 branch
.. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0083.h#1 branch
.. //depot/projects/vap/tools/regression/geom_eli/attach-d.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/configure-b-B.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/delkey.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/detach-l.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/init-B.t#1 branch
.. //depot/projects/vap/tools/regression/geom_eli/init-a.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/init-i-P.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/init.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/integrity-copy.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/integrity-data.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/integrity-hmac.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/kill.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/nokey.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/readonly.t#3 integrate
.. //depot/projects/vap/tools/regression/geom_eli/setkey.t#3 integrate
.. //depot/projects/vap/tools/regression/lib/libc/stdio/test-scanfloat.c#5 integrate
.. //depot/projects/vap/tools/tools/cd2dvd/cd2dvd.sh#1 branch
.. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#7 integrate
.. //depot/projects/vap/usr.bin/Makefile#10 integrate
.. //depot/projects/vap/usr.bin/gprof/mips.h#1 branch
.. //depot/projects/vap/usr.bin/limits/limits.1#3 integrate
.. //depot/projects/vap/usr.bin/limits/limits.c#3 integrate
.. //depot/projects/vap/usr.bin/locate/locate/locate.c#3 integrate
.. //depot/projects/vap/usr.bin/netstat/inet.c#7 integrate
.. //depot/projects/vap/usr.bin/netstat/main.c#5 integrate
.. //depot/projects/vap/usr.bin/netstat/netstat.h#6 integrate
.. //depot/projects/vap/usr.bin/netstat/route.c#6 integrate
.. //depot/projects/vap/usr.bin/pkill/Makefile#3 delete
.. //depot/projects/vap/usr.bin/pkill/pkill.1#3 delete
.. //depot/projects/vap/usr.bin/pkill/pkill.c#3 delete
.. //depot/projects/vap/usr.bin/sed/sed.1#4 integrate
.. //depot/projects/vap/usr.sbin/cxgbtool/cxgbtool.c#3 integrate
.. //depot/projects/vap/usr.sbin/cxgbtool/reg_defs_t3.c#3 integrate
.. //depot/projects/vap/usr.sbin/cxgbtool/reg_defs_t3b.c#3 integrate
.. //depot/projects/vap/usr.sbin/cxgbtool/reg_defs_t3c.c#1 branch
.. //depot/projects/vap/usr.sbin/cxgbtool/version.h#3 integrate
.. //depot/projects/vap/usr.sbin/lpr/lpd/recvjob.c#3 integrate
.. //depot/projects/vap/usr.sbin/ntp/config.h#4 integrate
.. //depot/projects/vap/usr.sbin/pciconf/pciconf.c#3 integrate
.. //depot/projects/vap/usr.sbin/syslogd/syslogd.c#7 integrate

Differences ...

==== //depot/projects/vap/ObsoleteFiles.inc#17 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.156 2008/08/24 10:01:22 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -16,6 +16,24 @@
 
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)
 OLD_FILES+=usr/libexec/pt_chown
+# 20080822: ntp 4.2.4p5 import
+OLD_FILES+=usr/share/doc/ntp/driver23.html
+OLD_FILES+=usr/share/doc/ntp/driver24.html
+# 20080821: several man pages moved from man4.i386 to man4
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz
+OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz
+OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz
+OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz
+OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz
+OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz
+OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz
+OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz
+OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz
+OLD_FILES+=usr/share/man/man4/i386/io.4.gz
+OLD_FILES+=usr/share/man/man4/i386/linux.4.gz
+OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz
+.endif
 # 20080820: MPSAFE TTY layer integrated
 OLD_FILES+=usr/include/sys/linedisc.h
 OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz

==== //depot/projects/vap/UPDATING#18 (text+ko) ====

@@ -41,6 +41,24 @@
 	Adding these drivers to your kernel configuration file shall
 	cause compilation to fail.
 
+20080818:
+	ntpd has been upgraded to 4.2.4p5.
+
+20080801:
+	OpenSSH has been upgraded to 5.1p1.
+
+	For many years, FreeBSD's version of OpenSSH preferred DSA
+	over RSA for host and user authentication keys.  With this
+	upgrade, we've switched to the vendor's default of RSA over
+	DSA.  This may cause upgraded clients to warn about unknown
+	host keys even for previously known hosts.  Users should
+	follow the usual procedure for verifying host keys before
+	accepting the RSA key.
+
+	This can be circumvented by setting the "HostKeyAlgorithms"
+	option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh
+	command line.
+
 20080713:
 	The sio(4) driver has been removed from the i386 and amd64
 	kernel configuration files. This means uart(4) is now the
@@ -1108,4 +1126,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.539 2008/08/20 08:31:58 ed Exp $
+$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $

==== //depot/projects/vap/bin/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $
+# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $
 
 .include <bsd.own.mk>
 
@@ -25,6 +25,7 @@
 	mkdir \
 	mv \
 	pax \
+	pkill \
 	ps \
 	pwd \
 	${_rcp} \

==== //depot/projects/vap/bin/sh/options.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.27 2008/08/27 20:16:06 stefanf Exp $");
 
 #include <signal.h>
 #include <unistd.h>
@@ -338,6 +338,7 @@
 	shellparam.malloc = 1;
 	shellparam.nparam = nparam;
 	shellparam.p = newparam;
+	shellparam.reset = 1;
 	shellparam.optnext = NULL;
 }
 
@@ -405,7 +406,6 @@
 	if (*argptr != NULL) {
 		setparam(argptr);
 	}
-	shellparam.reset = 1;
 	INTON;
 	return 0;
 }

==== //depot/projects/vap/bin/sh/sh.1#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.127 2008/08/30 22:35:21 ed Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -2118,7 +2118,7 @@
 For aliases the alias expansion is printed;
 for commands and tracked aliases
 the complete pathname of the command is printed.
-.It Ic ulimit Oo Fl HSabcdflmnstuv Oc Op Ar limit
+.It Ic ulimit Oo Fl HSabcdflmnpstuv Oc Op Ar limit
 Set or display resource limits (see
 .Xr getrlimit 2 ) .
 If
@@ -2172,6 +2172,8 @@
 The maximal resident set size of a process, in kilobytes.
 .It Fl n Ar nofiles
 The maximal number of descriptors that could be opened by a process.
+.It Fl p Ar pseudoterminals
+The maximal number of pseudo-terminals for this user ID.
 .It Fl s Ar stacksize
 The maximal size of the stack segment, in kilobytes.
 .It Fl t Ar time

==== //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ====

@@ -356,7 +356,7 @@
 
 #define	VOP_CLOSE(vp, f, c, o, cr)	0
 #define	VOP_PUTPAGE(vp, of, sz, fl, cr)	0
-#define	VOP_GETATTR(vp, vap, fl, cr)	((vap)->va_size = (vp)->v_size, 0)
+#define	VOP_GETATTR(vp, vap, fl)	((vap)->va_size = (vp)->v_size, 0)
 
 #define	VOP_FSYNC(vp, f, cr)	fsync((vp)->v_fd)
 

==== //depot/projects/vap/contrib/bind9/CHANGES#5 (text+ko) ====

@@ -1,3 +1,47 @@
+	--- 9.4.2-P2 released ---
+
+2406.   [bug]           Some operating systems have FD_SETSIZE set to a
+			low value by default, which can cause resource
+			exhaustion when many simultaneous connections are
+			open.  Linux in particular makes it difficult to
+			increase this value.  To use more sockets with
+			select(), set ISC_SOCKET_FDSETSIZE.  Example:
+			STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure
+			(This should not be necessary in most cases, and
+			never for an authoritative-only server.) [RT #18328]
+
+2404.	[port]		hpux: files unlimited support.
+
+2403.	[bug]		TSIG context leak. [RT #18341]
+
+2402.	[port]		Support Solaris 2.11 and over. [RT #18362]
+
+2401.	[bug]		Expect to get E[MN]FILE errno internal_accept()
+			(from accept() or fcntl() system calls). [RT #18358]
+
+2399.	[bug]		Abort timeout queries to reduce the number of open
+			UDP sockets. [RT #18367]
+
+2398.	[bug]           Improve file descriptor management.  New,
+			temporary, named.conf option reserved-sockets,
+			default 512. [RT #18344]
+
+2396.	[bug]		Don't set SO_REUSEADDR for randomized ports.
+			[RT #18336]
+
+2395.	[port]		Avoid warning and no effect from "files unlimited"
+			on Linux when running as root. [RT #18335]
+
+2394.	[bug]		Default configuration options set the limit for
+			open files to 'unlimited' as described in the
+			documentation. [RT #18331]
+
+2392.	[bug]		remove 'grep -q' from acl test script, some platforms
+			don't support it. [RT #18253]
+
+2322.	[port]		MacOS: work around the limitation of setrlimit()
+			for RLIMIT_NOFILE. [RT #17526]
+
 	--- 9.4.2-P1 released ---
 
 2375.   [security]      Fully randomize UDP query ports to improve
@@ -33,7 +77,7 @@
 			[RT #17113]
 
 2249.   [bug]           Only set Authentic Data bit if client requested
-                        DNSSEC, per RFC 3655 [RT #17175]
+			DNSSEC, per RFC 3655 [RT #17175]
 
 2248.   [cleanup]       Fix several errors reported by Coverity. [RT #17160]
 

==== //depot/projects/vap/contrib/bind9/COPYRIGHT#4 (text+ko) ====

@@ -1,4 +1,4 @@
-Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $
+$Id: COPYRIGHT,v 1.9.18.4.10.1 2008/07/23 07:28:54 tbox Exp $
 
 Portions Copyright (C) 1996-2001  Nominum, Inc.
 

==== //depot/projects/vap/contrib/bind9/bin/dig/dighost.c#4 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.259.18.43 2007/08/28 07:19:55 tbox Exp $ */
+/* $Id: dighost.c,v 1.259.18.43.10.3 2008/07/23 23:16:43 marka Exp $ */
 
 /*! \file
  *  \note
@@ -2217,14 +2217,15 @@
 	sockcount++;
 	debug("sockcount=%d", sockcount);
 	if (specified_source)
-		result = isc_socket_bind(query->sock, &bind_address);
+		result = isc_socket_bind(query->sock, &bind_address,
+					 ISC_SOCKET_REUSEADDRESS);
 	else {
 		if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) &&
 		    have_ipv4)
 			isc_sockaddr_any(&bind_any);
 		else
 			isc_sockaddr_any6(&bind_any);
-		result = isc_socket_bind(query->sock, &bind_any);
+		result = isc_socket_bind(query->sock, &bind_any, 0);
 	}
 	check_result(result, "isc_socket_bind");
 	bringup_timer(query, TCP_TIMEOUT);
@@ -2271,11 +2272,12 @@
 		sockcount++;
 		debug("sockcount=%d", sockcount);
 		if (specified_source) {
-			result = isc_socket_bind(query->sock, &bind_address);
+			result = isc_socket_bind(query->sock, &bind_address,
+						 ISC_SOCKET_REUSEADDRESS);
 		} else {
 			isc_sockaddr_anyofpf(&bind_any,
 					isc_sockaddr_pf(&query->sockaddr));
-			result = isc_socket_bind(query->sock, &bind_any);
+			result = isc_socket_bind(query->sock, &bind_any, 0);
 		}
 		check_result(result, "isc_socket_bind");
 

==== //depot/projects/vap/contrib/bind9/bin/named/client.c#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.219.18.28.10.1 2008/05/22 21:28:04 each Exp $ */
+/* $Id: client.c,v 1.219.18.28.10.2 2008/07/23 07:28:54 tbox Exp $ */
 
 #include <config.h>
 

==== //depot/projects/vap/contrib/bind9/bin/named/config.c#4 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.47.18.32 2007/09/13 05:04:01 each Exp $ */
+/* $Id: config.c,v 1.47.18.32.10.3 2008/07/23 23:48:17 tbox Exp $ */
 
 /*! \file */
 
@@ -52,7 +52,7 @@
 #ifndef WIN32

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


More information about the p4-projects mailing list