Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Sep 2008 21:25:18 GMT
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 149084 for review
Message-ID:  <200809022125.m82LPISX075305@repoman.freebsd.org>

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

Change 149084 by gonzo@gonzo_jeeves on 2008/09/02 21:24:46

	IFC @149082

Affected files ...

.. //depot/projects/mips2/src/UPDATING#18 integrate
.. //depot/projects/mips2/src/contrib/bind9/CHANGES#7 integrate
.. //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#7 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#7 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/configure.in#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#6 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#6 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#7 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#6 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#6 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/xfrin.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/api#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/app.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/resource.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/api#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/namedconf.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/version#7 integrate
.. //depot/projects/mips2/src/contrib/gcc/config/freebsd-spec.h#3 integrate
.. //depot/projects/mips2/src/contrib/gcc/config/freebsd.h#3 integrate
.. //depot/projects/mips2/src/contrib/gcc/config/i386/freebsd64.h#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libmilter/main.c#5 integrate
.. //depot/projects/mips2/src/crypto/openssh/config.h#4 integrate
.. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/fake-queue.h#2 delete
.. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/tree.h#2 delete
.. //depot/projects/mips2/src/gnu/lib/libgcc/Makefile#7 integrate
.. //depot/projects/mips2/src/gnu/lib/libgomp/Makefile#3 integrate
.. //depot/projects/mips2/src/gnu/lib/libgomp/config.h#3 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/Makefile#8 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/cc/Makefile.tgt#6 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/Makefile#8 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch
.. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete
.. //depot/projects/mips2/src/lib/bind/config.h#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#9 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_entry.h#7 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_entry_private.h#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#11 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_by_name.c#6 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/read_open_memory.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_acl_basic.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_acl_pax.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_bad_fd.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gtar.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_compat_zip.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_empty_write.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_entry.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_compress_program.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_data_large.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_extract.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_ar.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_odc.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_empty.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#6 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_mtree.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tar.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tbz.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tgz.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tz.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_zip.c#6 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_large.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_pax_truncated.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_position.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_truncated.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_tar_filenames.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_tar_large.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_compress.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_compress_program.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk.c#7 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_perms.c#7 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_secure.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_ar.c#6 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_shar_empty.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_tar.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_open_memory.c#4 integrate
.. //depot/projects/mips2/src/sbin/md5/md5.c#3 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/cpu_switch.S#7 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/machdep.c#13 integrate
.. //depot/projects/mips2/src/sys/amd64/ia32/ia32_signal.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/bm/if_bm.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/cpuctl/cpuctl.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_ioctl.h#6 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#16 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#14 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_fat.c#6 integrate
.. //depot/projects/mips2/src/sys/i386/xen/xen_machdep.c#2 integrate
.. //depot/projects/mips2/src/sys/kern/tty_ttydisc.c#2 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_socket.c#12 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/mips2/src/sys/modules/aha/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/ahb/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/an/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/ar/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/ath_rate_amrr/Makefile#6 integrate
.. //depot/projects/mips2/src/sys/modules/ath_rate_onoe/Makefile#6 integrate
.. //depot/projects/mips2/src/sys/modules/ath_rate_sample/Makefile#5 integrate
.. //depot/projects/mips2/src/sys/modules/ce/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/cp/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/ctau/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/cx/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/digi/digi/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/fatm/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/hatm/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/hifn/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/if_tap/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/linux/Makefile#4 integrate
.. //depot/projects/mips2/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/patm/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/pf/Makefile#4 integrate
.. //depot/projects/mips2/src/sys/modules/pflog/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/rp/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/safe/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/sppp/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/sr/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/svr4/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/trm/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/ubsec/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/wlan/Makefile#5 integrate
.. //depot/projects/mips2/src/sys/modules/wlan_acl/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/wlan_amrr/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/wlan_ccmp/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/wlan_rssadapt/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/wlan_tkip/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/wlan_wep/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/modules/wlan_xauth/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/net/route.c#10 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_hostcache.c#6 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_offload.c#3 integrate
.. //depot/projects/mips2/src/sys/netinet/toedev.h#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/aim/interrupt.c#2 integrate
.. //depot/projects/mips2/src/sys/sparc64/include/cache.h#4 integrate
.. //depot/projects/mips2/src/sys/sparc64/include/pcpu.h#5 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/autoconf.c#4 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/cache.c#3 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/cheetah.c#4 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/genassym.c#4 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/machdep.c#8 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_exception.S#3 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#8 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/spitfire.c#4 integrate
.. //depot/projects/mips2/src/tools/tools/cd2dvd/cd2dvd.sh#1 branch
.. //depot/projects/mips2/src/usr.bin/Makefile#15 integrate
.. //depot/projects/mips2/src/usr.bin/limits/limits.1#2 integrate
.. //depot/projects/mips2/src/usr.bin/limits/limits.c#3 integrate
.. //depot/projects/mips2/src/usr.bin/locate/locate/locate.c#2 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/inet.c#8 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/main.c#6 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/netstat.h#6 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/route.c#7 integrate
.. //depot/projects/mips2/src/usr.bin/sed/sed.1#5 integrate
.. //depot/projects/mips2/src/usr.sbin/cxgbtool/cxgbtool.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/cxgbtool/reg_defs_t3.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/cxgbtool/reg_defs_t3b.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/cxgbtool/version.h#2 integrate
.. //depot/projects/mips2/src/usr.sbin/lpr/lpd/recvjob.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/ntp/config.h#3 integrate
.. //depot/projects/mips2/src/usr.sbin/syslogd/syslogd.c#7 integrate

Differences ...

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

@@ -41,6 +41,21 @@
 	Adding these drivers to your kernel configuration file shall
 	cause compilation to fail.
 
+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 +1123,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.540 2008/09/01 23:50:56 des Exp $

==== //depot/projects/mips2/src/contrib/bind9/CHANGES#7 (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/mips2/src/contrib/bind9/COPYRIGHT#5 (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/mips2/src/contrib/bind9/bin/dig/dighost.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) 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/mips2/src/contrib/bind9/bin/named/client.c#7 (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/mips2/src/contrib/bind9/bin/named/config.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) 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
 "	coresize default;\n\
 	datasize default;\n\
-	files default;\n\
+	files unlimited;\n\
 	stacksize default;\n"
 #endif
 "	deallocate-on-exit true;\n\
@@ -99,6 +99,7 @@
 	use-ixfr true;\n\
 	edns-udp-size 4096;\n\
 	max-udp-size 4096;\n\
+	reserved-sockets 512;\n\
 \n\
 	/* view */\n\
 	allow-notify {none;};\n\

==== //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#4 (text+ko) ====

@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.40.18.10 2006/12/07 04:53:02 marka Exp $ */
+/* $Id: controlconf.c,v 1.40.18.10.40.3 2008/07/23 23:16:43 marka Exp $ */
 
 /*! \file */
 
@@ -1151,8 +1151,8 @@
 					   type, &listener->sock);
 
 	if (result == ISC_R_SUCCESS)
-		result = isc_socket_bind(listener->sock,
-					 &listener->address);
+		result = isc_socket_bind(listener->sock, &listener->address,
+					 ISC_SOCKET_REUSEADDRESS);
 
 	if (result == ISC_R_SUCCESS && type == isc_sockettype_unix) {
 		listener->perm = cfg_obj_asuint32(cfg_tuple_get(control,

==== //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#4 (text+ko) ====

@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.c,v 1.76.18.8 2006/07/20 01:10:30 marka Exp $ */
+/* $Id: interfacemgr.c,v 1.76.18.8.44.3 2008/07/23 23:16:43 marka Exp $ */
 
 /*! \file */
 
@@ -307,7 +307,8 @@
 #ifndef ISC_ALLOW_MAPPED
 	isc_socket_ipv6only(ifp->tcpsocket, ISC_TRUE);
 #endif
-	result = isc_socket_bind(ifp->tcpsocket, &ifp->addr);
+	result = isc_socket_bind(ifp->tcpsocket, &ifp->addr,
+				 ISC_SOCKET_REUSEADDRESS);
 	if (result != ISC_R_SUCCESS) {
 		isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR,
 				 "binding TCP socket: %s",

==== //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#4 (text+ko) ====

@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.c,v 1.46.18.7 2006/03/02 00:37:21 marka Exp $ */
+/* $Id: lwresd.c,v 1.46.18.7.52.3 2008/07/23 23:16:43 marka Exp $ */
 
 /*! \file 
  * \brief
@@ -576,7 +576,8 @@
 		return (result);
 	}
 
-	result = isc_socket_bind(sock, &listener->address);
+	result = isc_socket_bind(sock, &listener->address,
+				 ISC_SOCKET_REUSEADDRESS);
 	if (result != ISC_R_SUCCESS) {
 		char socktext[ISC_SOCKADDR_FORMATSIZE];
 		isc_sockaddr_format(&listener->address, socktext,

==== //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#5 (text+ko) ====

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.conf.docbook,v 1.1.2.29 2007/08/28 07:20:01 tbox Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.1.2.29.12.2 2008/07/23 23:48:17 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>
@@ -40,6 +40,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -201,6 +202,7 @@
 	port <replaceable>integer</replaceable>;
 	querylog <replaceable>boolean</replaceable>;
 	recursing-file <replaceable>quoted_string</replaceable>;
+	reserved-sockets <replaceable>integer</replaceable>;
 	random-device <replaceable>quoted_string</replaceable>;
 	recursive-clients <replaceable>integer</replaceable>;
 	serial-query-rate <replaceable>integer</replaceable>;

==== //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#7 (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: server.c,v 1.419.18.57.10.1 2008/05/22 21:28:04 each Exp $ */
+/* $Id: server.c,v 1.419.18.57.10.3 2008/07/23 12:04:32 marka Exp $ */
 
 /*! \file */
 
@@ -2696,27 +2696,29 @@
 load_configuration(const char *filename, ns_server_t *server,
 		   isc_boolean_t first_time)
 {
-	isc_result_t result;
-	isc_interval_t interval;
+	cfg_aclconfctx_t aclconfctx;
+	cfg_obj_t *config;
 	cfg_parser_t *parser = NULL;
-	cfg_obj_t *config;
+	const cfg_listelt_t *element;
+	const cfg_obj_t *builtin_views;
+	const cfg_obj_t *maps[3];
+	const cfg_obj_t *obj;
 	const cfg_obj_t *options;
+	const cfg_obj_t *v4ports, *v6ports;
 	const cfg_obj_t *views;
-	const cfg_obj_t *obj;
-	const cfg_obj_t *v4ports, *v6ports;
-	const cfg_obj_t *maps[3];
-	const cfg_obj_t *builtin_views;
-	const cfg_listelt_t *element;
 	dns_view_t *view = NULL;
 	dns_view_t *view_next;
+	dns_viewlist_t tmpviewlist;
 	dns_viewlist_t viewlist;
-	dns_viewlist_t tmpviewlist;
-	cfg_aclconfctx_t aclconfctx;
+	in_port_t listen_port;
+	int i;
+	isc_interval_t interval;
+	isc_resourcevalue_t files;
+	isc_result_t result;
+	isc_uint32_t heartbeat_interval;
 	isc_uint32_t interface_interval;
-	isc_uint32_t heartbeat_interval;
+	isc_uint32_t reserved;
 	isc_uint32_t udpsize;
-	in_port_t listen_port;
-	int i;
 
 	cfg_aclconfctx_init(&aclconfctx);
 	ISC_LIST_INIT(viewlist);
@@ -2797,6 +2799,43 @@
 	set_limits(maps);
 
 	/*
+	 * Sanity check on "files" limit.
+	 */
+	result = isc_resource_curlimit(isc_resource_openfiles, &files);
+	if (result == ISC_R_SUCCESS && files < FD_SETSIZE) {
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+			      NS_LOGMODULE_SERVER, ISC_LOG_WARNING,
+			      "the 'files' limit (%" ISC_PRINT_QUADFORMAT "u) "
+			      "is less than FD_SETSIZE (%d), increase "
+			      "'files' in named.conf or recompile with a "
+			      "smaller FD_SETSIZE.", files, FD_SETSIZE);
+		if (files > FD_SETSIZE)
+			files = FD_SETSIZE;
+	} else
+		files = FD_SETSIZE;
+
+	/*
+	 * Set the number of socket reserved for TCP, stdio etc.
+	 */
+	obj = NULL;
+	result = ns_config_get(maps, "reserved-sockets", &obj);
+	INSIST(result == ISC_R_SUCCESS);
+	reserved = cfg_obj_asuint32(obj);
+	if (files < 128U)			/* Prevent underflow. */
+		reserved = 0;
+	else if (reserved > files - 128U)	/* Mimimum UDP space. */
+		reserved = files - 128;
+	if (reserved < 128U)			/* Mimimum TCP/stdio space. */
+		reserved = 128;
+	if (reserved + 128U > files) {
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                              NS_LOGMODULE_SERVER, ISC_LOG_WARNING,
+			      "less than 128 UDP sockets available after "
+			      "applying 'reserved-sockets' and 'files'");
+	}
+	isc__socketmgr_setreserved(ns_g_socketmgr, reserved);
+	
+	/*
 	 * Configure various server options.
 	 */
 	configure_server_quota(maps, "transfers-out", &server->xfroutquota);

==== //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#4 (text+ko) ====

@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.96.18.17 2006/08/04 03:03:41 marka Exp $ */
+/* $Id: rndc.c,v 1.96.18.17.42.3 2008/07/23 23:16:43 marka Exp $ */
 
 /*! \file */
 
@@ -400,10 +400,10 @@
 	DO("create socket", isc_socket_create(socketmgr, pf, type, &sock));
 	switch (isc_sockaddr_pf(addr)) {
 	case AF_INET:
-		DO("bind socket", isc_socket_bind(sock, &local4));
+		DO("bind socket", isc_socket_bind(sock, &local4, 0));
 		break;
 	case AF_INET6:
-		DO("bind socket", isc_socket_bind(sock, &local6));
+		DO("bind socket", isc_socket_bind(sock, &local6, 0));
 		break;
 	default:
 		break;

==== //depot/projects/mips2/src/contrib/bind9/configure.in#5 (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) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.355.18.71 $)
+AC_REVISION($Revision: 1.355.18.71.8.2 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -1839,7 +1839,7 @@
 	[*-solaris2.[89]])
 		hack_shutup_pthreadonceinit=yes
 		;;
-	*-solaris2.10)
+	*-solaris2.1[0-9])
 		hack_shutup_pthreadonceinit=yes
 		;;
 esac

==== //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 (text+ko) ====

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - 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
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.241.18.82.8.1 2008/05/22 21:28:04 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.241.18.82.8.3 2008/07/23 12:04:32 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">;
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -28,6 +28,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
@@ -4441,6 +4442,7 @@
     <optional> max-transfer-idle-in <replaceable>number</replaceable>; </optional>
     <optional> max-transfer-idle-out <replaceable>number</replaceable>; </optional>
     <optional> tcp-clients <replaceable>number</replaceable>; </optional>
+    <optional> reserved-sockets <replaceable>number</replaceable>; </optional>
     <optional> recursive-clients <replaceable>number</replaceable>; </optional>
     <optional> serial-query-rate <replaceable>number</replaceable>; </optional>
     <optional> serial-queries <replaceable>number</replaceable>; </optional>
@@ -6606,6 +6608,23 @@
             </varlistentry>
 
             <varlistentry>
+              <term><command>reserved-sockets</command></term>
+              <listitem>
+                <para>
+		  The number of file descriptors reserved for TCP, stdio,
+		  etc.  This needs to be big enough to cover the number of
+		  interfaces named listens on, tcp-clients as well as
+		  to provide room for outgoing TCP queries and incoming zone
+		  transfers.  The default is <literal>512</literal>.
+		  The minimum value is <literal>128</literal> and the
+		  maximum value is <literal>128</literal> less than
+		  'files' or FD_SETSIZE (whichever is smaller).  This
+		  option may be removed in the future.
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
               <term><command>max-cache-size</command></term>
               <listitem>
                 <para>

==== //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#5 (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) 2001, 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.
 
-AC_REVISION($Revision: 1.90.18.34 $)
+AC_REVISION($Revision: 1.90.18.34.10.2 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -2590,7 +2590,7 @@
 	*-solaris2.9)
 		hack_shutup_in6addr_init_macros=yes
 		;;
-	*-solaris2.10)
+	*-solaris2.1[0-9])
 		hack_shutup_in6addr_init_macros=yes
 		;;
 esac

==== //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#6 (text+ko) ====

@@ -1015,10 +1015,10 @@
 	isc_buffer_add(&b, strlen(zname));
 	tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b,
 				   dns_rootname, ISC_TRUE, NULL);
-	if (tresult != ISC_R_SUCCESS) {
+	if (result != ISC_R_SUCCESS) {
 		cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR,
 			    "zone '%s': is not a valid name", zname);
-		result = ISC_R_FAILURE;
+		tresult = ISC_R_FAILURE;
 	} else {
 		char namebuf[DNS_NAME_FORMATSIZE];
 

==== //depot/projects/mips2/src/contrib/bind9/lib/dns/api#6 (text+ko) ====

@@ -1,3 +1,3 @@
 LIBINTERFACE = 35
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0

==== //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#7 (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: dispatch.c,v 1.116.18.19.12.1 2008/05/22 21:28:06 each Exp $ */
+/* $Id: dispatch.c,v 1.116.18.19.12.5 2008/07/23 23:16:43 marka Exp $ */
 
 /*! \file */
 
@@ -276,7 +276,26 @@
 }
 
 /*
- * ARC4 random number generator obtained from OpenBSD
+ * ARC4 random number generator derived from OpenBSD.
+ * Only dispatch_arc4random() and dispatch_arc4uniformrandom() are expected
+ * to be called from general dispatch routines; the rest of them are subroutines
+ * for these two.
+ *
+ * The original copyright follows:
+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 static void
 dispatch_arc4init(arc4ctx_t *actx) {
@@ -1172,7 +1191,7 @@
 
 static isc_result_t
 create_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local,
-	      isc_socket_t **sockp)
+	      unsigned int options, isc_socket_t **sockp)
 {
 	isc_socket_t *sock;
 	isc_result_t result;
@@ -1186,7 +1205,7 @@
 #ifndef ISC_ALLOW_MAPPED
 	isc_socket_ipv6only(sock, ISC_TRUE);
 #endif
-	result = isc_socket_bind(sock, local);
+	result = isc_socket_bind(sock, local, options);
 	if (result != ISC_R_SUCCESS) {
 		isc_socket_detach(&sock);
 		return (result);
@@ -1917,7 +1936,7 @@
 				attributes &= ~DNS_DISPATCHATTR_RANDOMPORT;
 			goto getsocket;
 		}
-		result = create_socket(sockmgr, &localaddr_bound, &sock);
+		result = create_socket(sockmgr, &localaddr_bound, 0, &sock);
 		if (result == ISC_R_ADDRINUSE) {
 			if (++k == 1024)
 				attributes &= ~DNS_DISPATCHATTR_RANDOMPORT;
@@ -1925,7 +1944,8 @@
 		}
 		localport = prt;
 	} else
-		result = create_socket(sockmgr, localaddr, &sock);
+		result = create_socket(sockmgr, localaddr,
+				       ISC_SOCKET_REUSEADDRESS, &sock);
 	if (result != ISC_R_SUCCESS)
 		goto deallocate_dispatch;
 	if ((attributes & DNS_DISPATCHATTR_RANDOMPORT) == 0 &&

==== //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#6 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 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: dispatch.h,v 1.48.18.5.12.1 2008/05/22 21:28:06 each Exp $ */
+/* $Id: dispatch.h,v 1.48.18.5.12.2 2008/07/23 07:28:56 tbox Exp $ */
 
 #ifndef DNS_DISPATCH_H
 #define DNS_DISPATCH_H 1

==== //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#4 (text+ko) ====

@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.72.18.5 2006/08/21 00:40:53 marka Exp $ */
+/* $Id: request.c,v 1.72.18.5.42.2 2008/07/23 07:28:56 tbox Exp $ */
 
 /*! \file */
 
@@ -518,11 +518,11 @@
 	if (srcaddr == NULL) {
 		isc_sockaddr_anyofpf(&bind_any,
 				     isc_sockaddr_pf(destaddr));
-		result = isc_socket_bind(socket, &bind_any);
+		result = isc_socket_bind(socket, &bind_any, 0);
 	} else {
 		src = *srcaddr;
 		isc_sockaddr_setport(&src, 0);
-		result = isc_socket_bind(socket, &src);
+		result = isc_socket_bind(socket, &src, 0);
 	}
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;

==== //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#6 (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: resolver.c,v 1.284.18.66.8.1 2008/05/22 21:28:06 each Exp $ */
+/* $Id: resolver.c,v 1.284.18.66.8.4 2008/07/24 05:00:48 jinmei Exp $ */
 
 /*! \file */
 
@@ -1123,7 +1123,7 @@
 			goto cleanup_query;
 
 #ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
-		result = isc_socket_bind(query->tcpsocket, &addr);

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



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