This commit was manufactured by cvs2git to create tag 'v9_4_ESV_R5rc1'.

2011-06-16 01:34:45 +00:00
14 changed files with 94 additions and 383 deletions
@@ -1,12 +1,3 @@
-	--- 9.4-ESV-R5 released ---
-
-3135.	[port]		FreeBSD: workaround broken IPV6_USE_MIN_MTU processing.
-			See http://www.freebsd.org/cgi/query-pr.cgi?pr=158307
-			[RT #24950]
-
-3023.	[bug]		Named could be left in an inconsistent state when
-			receiving multiple AXFR response messages that were
-			not all TSIG-signed. [RT #23254]

 	--- 9.4-ESV-R5rc1 released ---

@@ -42,11 +42,6 @@ BIND 9
 		Stichting NLnet - NLnet Foundation
 		Nominum, Inc.

-BIND 9.4-ESV-R5 (Extended Support Version)
-
-	BIND 9.4-ESV-R5 is expected to be the last release in the 9.4
-	series.
-
 BIND 9.4-ESV (Extended Support Version)

 	BIND 9.4-ESV is the Extended Support Version of BIND 9.4
@@ -1,132 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- - Copyright (C) 2010, 2011  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
- - copyright notice and this permission notice appear in all copies.
- -
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS.  IN NO EVENT SHALL ISC 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.
-->
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title></title><link rel="stylesheet" href="release-notes.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article"><div class="titlepage"><hr /></div>

-<!-- $Id: RELEASE-NOTES-BIND-9.4-ESV.html,v 1.1.2.12 2011/07/24 08:05:11 tbox Exp $ -->
-
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title></title><link rel="stylesheet" href="release-notes.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.71.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><hr /></div>
-
-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3359578"></a>Introduction</h2></div></div></div>
+  <div class="section" title="Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366823"></a>Introduction</h2></div></div></div>
    
    <p>
-			BIND 9.4-ESV-R5 is the current production release
-			of BIND 9.4.
+			BIND 9.4-ESV-R5rc1 is the first release
+			candidate of BIND 9.4-ESV-R5.
 		</p>
    <p>
-			This document summarizes changes from BIND 9.4-ESV-R4 to BIND 9.4-ESV-R5.
+			This document summarizes changes from BIND 9.4-ESV-R4 to BIND 9.4-ESV-R5rc1.
 			Please see the CHANGES file in the source code release for a
 			complete list of all changes.
 		</p>
  </div>

-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3358597"></a>Download</h2></div></div></div>
+  <div class="section" title="Download"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366840"></a>Download</h2></div></div></div>
    
    <p>
 			The latest release of BIND 9 software can always be found
 	 		on our web site at
-      <a href="http://www.isc.org/downloads/all" target="_top">http://www.isc.org/downloads/all</a>.
+      <a class="ulink" href="http://www.isc.org/downloads/all" target="_top">http://www.isc.org/downloads/all</a>.
  		There you will find additional information about each release,
 			source code, and some pre-compiled versions for certain operating
 			systems.
 		</p>
  </div>

-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3358630"></a>Support</h2></div></div></div>
+  <div class="section" title="Support"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366780"></a>Support</h2></div></div></div>
    
    <p>Product support information is available on
-      <a href="http://www.isc.org/services/support" target="_top">http://www.isc.org/services/support</a>
+      <a class="ulink" href="http://www.isc.org/services/support" target="_top">http://www.isc.org/services/support</a>
      for paid support options.  Free support is provided by our user
 			community via a mailing list.  Information on all public email
 			lists is available at
-      <a href="https://lists.isc.org/mailman/listinfo" target="_top">https://lists.isc.org/mailman/listinfo</a>.
+      <a class="ulink" href="https://lists.isc.org/mailman/listinfo" target="_top">https://lists.isc.org/mailman/listinfo</a>.
    </p>
  </div>

-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3358679"></a>New Features</h2></div></div></div>
+  <div class="section" title="New Features"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366717"></a>New Features</h2></div></div></div>
    
-		<div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id3358720"></a>9.4-ESV-R5</h3></div></div></div>
+		<div class="section" title="9.4-ESV-R5rc1"><div class="titlepage"><div><div><h3 class="title"><a id="id1366731"></a>9.4-ESV-R5rc1</h3></div></div></div>
 			
 			<p>None.</p>
 		</div>
  </div>

-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3358748"></a>Feature Changes</h2></div></div></div>
+  <div class="section" title="Feature Changes"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366712"></a>Feature Changes</h2></div></div></div>
    
-		<div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id3358768"></a>9.4-ESV-R5</h3></div></div></div>
+		<div class="section" title="9.4-ESV-R5rc1"><div class="titlepage"><div><div><h3 class="title"><a id="id1366851"></a>9.4-ESV-R5rc1</h3></div></div></div>
 			
 			<p>None.</p>
 		</div>
  </div>

-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3358796"></a>Security Fixes</h2></div></div></div>
+  <div class="section" title="Security Fixes"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366862"></a>Security Fixes</h2></div></div></div>
    
-		<div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id3358816"></a>9.4-ESV-R5</h3></div></div></div>
+		<div class="section" title="9.4-ESV-R5rc1"><div class="titlepage"><div><div><h3 class="title"><a id="id1366867"></a>9.4-ESV-R5rc1</h3></div></div></div>
 			
-			<div class="itemizedlist"><ul type="disc"><li>
+			<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 A bug in NetBSD and FreeBSD kernels with SO_ACCEPTFILTER enabled allows
 for a TCP DoS attack. Until there is a kernel fix, ISC is disabling
 SO_ACCEPTFILTER support in BIND. [RT #22589]
-</li><li>
+</li><li class="listitem">
 named, set up to be a caching resolver, is vulnerable to a
 user querying a domain with very large resource record sets (RRSets)
 when trying to negatively cache the response. Due to an off-by-one
 error, caching the response could cause named to crash. [RT #24650]
 [CVE-2011-1910]
-</li><li>
-Change #2912 (see CHANGES) exposed a latent bug in the DNS message
-processing code that could allow certain UPDATE requests to crash
-named. This was fixed by disambiguating internal database representation
-vs DNS wire format data. [RT #24777] [CVE-2011-2464]
 </li></ul></div>
 		</div>
  </div>

-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3358855"></a>Bug Fixes</h2></div></div></div>
+  <div class="section" title="Bug Fixes"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366888"></a>Bug Fixes</h2></div></div></div>
    
-		<div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id3358861"></a>9.4-ESV-R5</h3></div></div></div>
+		<div class="section" title="9.4-ESV-R5rc1"><div class="titlepage"><div><div><h3 class="title"><a id="id1366894"></a>9.4-ESV-R5rc1</h3></div></div></div>
 			
-	    <div class="itemizedlist"><ul type="disc"><li>
+	    <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
+Improved the mechanism for flagging database entries as negative
+cache records; the former method, RR type 0, could be ambiguous.
+[RT #24777]
+</li><li class="listitem">
 During RFC5011 processing some journal write errors were not detected.
 This could lead to managed-keys changes being committed but not 
 recorded in the journal files, causing potential inconsistencies  
 during later processing.  [RT #20256]
-<p>
+</li><li class="listitem">
 A potential NULL pointer deference in the DNS64 code could cause 
 named to terminate unexpectedly. [RT #20256]
-</p>
-<p>
+</li><li class="listitem">
 A state variable relating to DNSSEC could fail to be set during 
 some infrequently-executed code paths, allowing it to be used whilst
 in an unitialized state during cache updates, with unpredictable results.
 [RT #20256]
-</p>
-<p>
+</li><li class="listitem">
 A potential NULL pointer deference in DNSSEC signing code could 
 cause named to terminate unexpectedly  [RT #20256]
-</p>
-<p>
+</li><li class="listitem">
 Several cosmetic code changes were made to silence warnings
 generated by a static code analysis tool. [RT #20256]
-</p>
-</li><li>
+</li><li class="listitem">
 Cause named to terminate at startup or rndc reconfig
 reload to fail, if a log file specified in the
 conf file isn't a plain file. (RT #22771]
-</li><li>
+</li><li class="listitem">
 Prior to this fix, when named was was writing a zone to disk (as slave,
 when resigning, etc.), it might not correctly preserve the case of domain
 name labels within RDATA, if the RDATA was not compressible. The result
@@ -135,69 +112,58 @@ that did not match the RRSIG for that data, due to case mismatch. named
 now correctly preserves case. After upgrading to fixed code, the operator
 should either resign the data (on the master) or delete the disk file
 on the slave and reload the zone. [RT #22863]
-</li><li>
+</li><li class="listitem">
 Fix the zonechecks system test to fail on error (warning in 9.6,
 fatal in 9.7) to match behaviour for 9.4. [RT #22905]
-</li><li>
+</li><li class="listitem">
 There was a bug in how the clients-per-query code worked with some
 query patterns. This could result, in rare circumstances, in having all
 the client query slots filled with queries for the same DNS label,
 essentially ignoring the max-clients-per-query setting.
 [RT #22972]
-</li><li>
-If a slave initiates a TSIG signed AXFR from the master and the master
-fails to correctly TSIG sign the final message, the slave would be left
-with the zone in an unclean state. named detected this error too late
-and named would crash with an INSIST. The order dependancy has been
-fixed. [RT #23254]
-</li><li>
+</li><li class="listitem">
 Fixed precedence order bug with NS and DNAME records if both are present.
 (Also fixed timing of autosign test in 9.7+) [RT #23035]
-</li><li>
+</li><li class="listitem">
 Changing TTL did not cause dnssec-signzone to generate new signatures.
 [RT #23330]
-</li><li>
+</li><li class="listitem">
 If named encountered a CNAME instead of a DS record when walking
 the chain of trust down from the trust anchor, it incorrectly stopped
 validating. [RT #23338]
-</li><li>
+</li><li class="listitem">
 RRSIG records could have time stamps too far in the future.
 [RT #23356]
-</li><li>
+</li><li class="listitem">
 If running on a powerpc CPU and with atomic operations enabled,
 named could lock up. Added sync instructions to the end of atomic
 operations. [RT #23469]
-</li><li>
+</li><li class="listitem">
 ixfr-from-differences {master|slave};
 failed to select the master/slave zones, resulting in on diff/journal
 file being created.
 [RT #23580]
-</li><li>
+</li><li class="listitem">
 Remove bin/tests/system/logfileconfig/ns1/named.conf and
 add setup.sh in order to resolve changing named.conf issue. [RT #23687]
-</li><li>
+</li><li class="listitem">
 The autosign tests attempted to open ports within reserved ranges. Test
 now avoids those ports.
 [RT #23957]
-</li><li>
+</li><li class="listitem">
 Named could fail to validate zones list in a DLV that validated insecure
 without using DLV and had DS records in the parent zone. [RT #24631]
-</li><li>
-A bug in FreeBSD kernels causes IPv6 UDP responses greater than
-1280 bytes to not fragment as they should. Until there is a kernel
-fix, named will work around this by setting IPV6_USE_MIN_MTU on a
-per packet basis. [RT #24950]
 </li></ul></div>
 		</div>
  </div>

-  <div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3359002"></a>Thank You</h2></div></div></div>
+  <div class="section" title="Thank You"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id1366996"></a>Thank You</h2></div></div></div>
    
    <p>
      Thank you to everyone who assisted us in making this release possible.
      If you would like to contribute to ISC to assist us in continuing to make
      quality open source software, please visit our donations page at
-      <a href="http://www.isc.org/supportisc" target="_top">http://www.isc.org/supportisc</a>.
+      <a class="ulink" href="http://www.isc.org/supportisc" target="_top">http://www.isc.org/supportisc</a>.
    </p>
  </div>
 </div></body></html>
@@ -2,11 +2,11 @@

 Introduction

-   BIND 9.4-ESV-R5 is the current production release of BIND 9.4.
+   BIND 9.4-ESV-R5rc1 is the first release candidate of BIND 9.4-ESV-R5.

   This document summarizes changes from BIND 9.4-ESV-R4 to BIND
-   9.4-ESV-R5. Please see the CHANGES file in the source code release for
-   a complete list of all changes.
+   9.4-ESV-R5rc1. Please see the CHANGES file in the source code release
+   for a complete list of all changes.

 Download

@@ -25,19 +25,19 @@ Support

 New Features

-9.4-ESV-R5
+9.4-ESV-R5rc1

   None.

 Feature Changes

-9.4-ESV-R5
+9.4-ESV-R5rc1

   None.

 Security Fixes

-9.4-ESV-R5
+9.4-ESV-R5rc1

     * A bug in NetBSD and FreeBSD kernels with SO_ACCEPTFILTER enabled
       allows for a TCP DoS attack. Until there is a kernel fix, ISC is
@@ -47,28 +47,27 @@ Security Fixes
       when trying to negatively cache the response. Due to an off-by-one
       error, caching the response could cause named to crash. [RT #24650]
       [CVE-2011-1910]
-     * Change #2912 (see CHANGES) exposed a latent bug in the DNS message
-       processing code that could allow certain UPDATE requests to crash
-       named. This was fixed by disambiguating internal database
-       representation vs DNS wire format data. [RT #24777] [CVE-2011-2464]

 Bug Fixes

-9.4-ESV-R5
+9.4-ESV-R5rc1

+     * Improved the mechanism for flagging database entries as negative
+       cache records; the former method, RR type 0, could be ambiguous.
+       [RT #24777]
     * During RFC5011 processing some journal write errors were not
       detected. This could lead to managed-keys changes being committed
       but not recorded in the journal files, causing potential
       inconsistencies during later processing. [RT #20256]
-       A potential NULL pointer deference in the DNS64 code could cause
+     * A potential NULL pointer deference in the DNS64 code could cause
       named to terminate unexpectedly. [RT #20256]
-       A state variable relating to DNSSEC could fail to be set during
+     * A state variable relating to DNSSEC could fail to be set during
       some infrequently-executed code paths, allowing it to be used
       whilst in an unitialized state during cache updates, with
       unpredictable results. [RT #20256]
-       A potential NULL pointer deference in DNSSEC signing code could
+     * A potential NULL pointer deference in DNSSEC signing code could
       cause named to terminate unexpectedly [RT #20256]
-       Several cosmetic code changes were made to silence warnings
+     * Several cosmetic code changes were made to silence warnings
       generated by a static code analysis tool. [RT #20256]
     * Cause named to terminate at startup or rndc reconfig reload to
       fail, if a log file specified in the conf file isn't a plain file.
@@ -89,11 +88,6 @@ Bug Fixes
       all the client query slots filled with queries for the same DNS
       label, essentially ignoring the max-clients-per-query setting. [RT
       #22972]
-     * If a slave initiates a TSIG signed AXFR from the master and the
-       master fails to correctly TSIG sign the final message, the slave
-       would be left with the zone in an unclean state. named detected
-       this error too late and named would crash with an INSIST. The order
-       dependancy has been fixed. [RT #23254]
     * Fixed precedence order bug with NS and DNAME records if both are
       present. (Also fixed timing of autosign test in 9.7+) [RT #23035]
     * Changing TTL did not cause dnssec-signzone to generate new
@@ -116,10 +110,6 @@ Bug Fixes
     * Named could fail to validate zones list in a DLV that validated
       insecure without using DLV and had DS records in the parent zone.
       [RT #24631]
-     * A bug in FreeBSD kernels causes IPv6 UDP responses greater than
-       1280 bytes to not fragment as they should. Until there is a kernel
-       fix, named will work around this by setting IPV6_USE_MIN_MTU on a
-       per packet basis. [RT #24950]

 Thank You

@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# Permission to use, copy, modify, and/or distribute this software for any
+# 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.
 #
@@ -15,13 +15,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: tests.sh,v 1.23.18.3 2011/06/21 22:14:15 each Exp $
+# $Id: tests.sh,v 1.23 2004/03/05 05:01:55 marka Exp $

 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

 status=0
-n=0

 echo "I:fetching first copy of zone before update"
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd example.nil.\
@@ -59,72 +58,6 @@ echo "I:comparing post-update copies to known good data"
 $PERL ../digcomp.pl knowngood.ns1.after dig.out.ns1 || status=1
 $PERL ../digcomp.pl knowngood.ns1.after dig.out.ns2 || status=1

-n=`expr $n + 1`
-ret=0
-echo "I:check TYPE=0 update is rejected by nsupdate ($n)"
-$NSUPDATE <<END > nsupdate.out 2>&1 && ret=1
-    server 10.53.0.1 5300
-    update add example.nil. 300 in type0 ""
-    send
-END
-grep "unknown class/type" nsupdate.out > /dev/null 2>&1 || ret=1
-if [ $ret -ne 0 ]; then
-    echo "I:failed"
-    status=1
-fi
-
-n=`expr $n + 1`
-ret=0
-echo "I:check TYPE=0 prerequisite is handled ($n)"
-$NSUPDATE <<END > nsupdate.out 2>&1 || ret=1
-    server 10.53.0.1 5300
-    prereq nxrrset example.nil. type0
-    send
-END
-$DIG +tcp version.bind txt ch @10.53.0.1 -p 5300 > dig.out.ns1.$n
-grep "status: NOERROR" dig.out.ns1.$n > /dev/null || ret=1
-if [ $ret -ne 0 ]; then
-    echo "I:failed"
-    status=1
-fi
-
-n=`expr $n + 1`
-ret=0
-echo "I:check that TYPE=0 update is handled ($n)"
-echo "a0e4280000010000000100000000060001c00c000000fe000000000000" |
-$PERL ../packet.pl -a 10.53.0.1 -p 5300 -t tcp > /dev/null
-$DIG +tcp version.bind txt ch @10.53.0.1 -p 5300 > dig.out.ns1.$n
-grep "status: NOERROR" dig.out.ns1.$n > /dev/null || ret=1
-if test $ret -ne 0
-then
-	echo "I:failed"
-        status=1
-fi
-
-n=`expr $n + 1`
-echo "I:check that TYPE=0 additional data is handled ($n)"
-echo "a0e4280000010000000000010000060001c00c000000fe000000000000" |
-$PERL ../packet.pl -a 10.53.0.1 -p 5300 -t tcp > /dev/null
-$DIG +tcp version.bind txt ch @10.53.0.1 -p 5300 > dig.out.ns1.$n
-grep "status: NOERROR" dig.out.ns1.$n > /dev/null || ret=1
-if test $ret -ne 0
-then
-	echo "I:failed"
-        status=1
-fi
-
-n=`expr $n + 1`
-echo "I:check that update to undefined class is handled ($n)"
-echo "a0e4280000010001000000000000060101c00c000000fe000000000000" |
-$PERL ../packet.pl -a 10.53.0.1 -p 5300 -t tcp > /dev/null
-$DIG +tcp version.bind txt ch @10.53.0.1 -p 5300 > dig.out.ns1.$n
-grep "status: NOERROR" dig.out.ns1.$n > /dev/null || ret=1
-if test $ret -ne 0
-then
-	echo "I:failed"
-        status=1
-fi
-
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
    echo "I:running update.pl test"
@@ -1,107 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (C) 2011  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
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC 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.
-
-# $Id: packet.pl,v 1.2.36.2 2011/06/09 00:42:47 each Exp $
-
-# This is a tool for sending an arbitrary packet via UDP or TCP to an
-# arbitrary address and port.  The packet is specified in a file or on
-# the standard input, in the form of a series of bytes in hexidecimal.
-# Whitespace is ignored, as is anything following a '#' symbol.
-#
-# For example, the following input would generate normal query for 
-# isc.org/NS/IN":
-#
-#     # QID:
-#     0c d8
-#     # header:
-#     01 00 00 01 00 00 00 00 00 00
-#     # qname isc.org:
-#     03 69 73 63 03 6f 72 67 00
-#     # qtype NS:
-#     00 02
-#     # qclass IN:
-#     00 01
-#
-# Note that we do not wait for a response for the server.  This is simply
-# a way of injecting arbitrary packets to test server resposnes.
-#
-# Usage: packet.pl [-a <address>] [-p <port>] [-t (udp|tcp)] [filename]
-#
-# If not specified, address defaults to 127.0.0.1, port to 53, protocol
-# to udp, and file to stdin.
-#
-# XXX: Doesn't support IPv6 yet
-
-require 5.006.001;
-
-use strict;
-use Getopt::Std;
-use IO::File;
-use IO::Socket;
-
-sub usage {
-    print ("Usage: packet.pl [-a address] [-p port] [-t (tcp|udp)] [file]\n");
-    exit 1;
-}
-
-my %options={};
-getopts("a:p:t:", \%options);
-
-my $addr = "127.0.0.1";
-$addr = $options{a} if defined $options{a};
-
-my $port = 53;
-$port = $options{p} if defined $options{p};
-
-my $proto = "udp";
-$proto = lc $options{t} if defined $options{t};
-usage if ($proto !~ /^(udp|tcp)$/);
-
-my $file = "STDIN";
-if (@ARGV >= 1) {
-    my $filename = shift @ARGV;
-    open FH, "<$filename" or die "$filename: $!";
-    $file = "FH";
-}
-
-my $input = "";
-while (defined(my $line = <$file>) ) {
-    chomp $line;
-    $line =~ s/#.*$//;
-    $input .= $line;
-}
-
-$input =~ s/\s+//g;
-my $data = pack("H*", $input);
-my $len = length $data;
-
-my $output = unpack("H*", $data);
-print ("sending: $output\n");
-
-my $sock = IO::Socket::INET->new(PeerAddr => $addr, PeerPort => $port,
-				 Proto => $proto,) or die "$!";
-
-my $bytes;
-if ($proto eq "udp") {
-    $bytes = $sock->send($data);
-} else {
-    $bytes = $sock->syswrite(pack("n", $len), 2);
-    $bytes += $sock->syswrite($data, $len);
-}
-
-print ("sent $bytes bytes to $addr:$port\n");
-$sock->close;
-close $file;
@@ -1,6 +1,6 @@
-# $Id: SRCID,v 1.17.4.174 2011/07/23 00:15:16 tbox Exp $
+# $Id: SRCID,v 1.17.4.161 2011/05/31 01:15:47 tbox Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
-SRCID="( $Date: 2011/07/23 00:15:16 $ )"
+SRCID="( $Date: 2011/05/31 01:15:47 $ )"
@@ -1,3 +1,3 @@
 LIBINTERFACE = 39
-LIBREVISION = 4
+LIBREVISION = 3
 LIBAGE = 1
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011  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: xfrin.c,v 1.135.18.24 2011/07/22 06:24:01 marka Exp $ */
+/* $Id: xfrin.c,v 1.135.18.23 2008/09/25 04:15:52 marka Exp $ */

 /*! \file */

@@ -83,9 +83,8 @@ typedef enum {
 	XFRST_IXFR_DEL,
 	XFRST_IXFR_ADDSOA,
 	XFRST_IXFR_ADD,
-	XFRST_IXFR_END,
 	XFRST_AXFR,
-	XFRST_AXFR_END
+	XFRST_END
 } xfrin_state_t;

 /*%
@@ -199,7 +198,6 @@ static isc_result_t axfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op,
 				   dns_rdata_t *rdata);
 static isc_result_t axfr_apply(dns_xfrin_ctx_t *xfr);
 static isc_result_t axfr_commit(dns_xfrin_ctx_t *xfr);
-static isc_result_t axfr_finalize(dns_xfrin_ctx_t *xfr);

 static isc_result_t ixfr_init(dns_xfrin_ctx_t *xfr);
 static isc_result_t ixfr_apply(dns_xfrin_ctx_t *xfr);
@@ -315,16 +313,6 @@ axfr_commit(dns_xfrin_ctx_t *xfr) {

 	CHECK(axfr_apply(xfr));
 	CHECK(dns_db_endload(xfr->db, &xfr->axfr.add_private));
-
-	result = ISC_R_SUCCESS;
- failure:
-	return (result);
-}
-
-static isc_result_t
-axfr_finalize(dns_xfrin_ctx_t *xfr) {
-	isc_result_t result;
-
 	CHECK(dns_zone_replacedb(xfr->zone, xfr->db, ISC_TRUE));

 	result = ISC_R_SUCCESS;
@@ -546,7 +534,7 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 			isc_uint32_t soa_serial = dns_soa_getserial(rdata);
 			if (soa_serial == xfr->end_serial) {
 				CHECK(ixfr_commit(xfr));
-				xfr->state = XFRST_IXFR_END;
+				xfr->state = XFRST_END;
 				break;
 			} else if (soa_serial != xfr->ixfr.current_serial) {
 				xfrin_log(xfr, ISC_LOG_ERROR,
@@ -577,12 +565,11 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 		CHECK(axfr_putdata(xfr, DNS_DIFFOP_ADD, name, ttl, rdata));
 		if (rdata->type == dns_rdatatype_soa) {
 			CHECK(axfr_commit(xfr));
-			xfr->state = XFRST_AXFR_END;
+			xfr->state = XFRST_END;
 			break;
 		}
 		break;
-	case XFRST_AXFR_END:
-	case XFRST_IXFR_END:
+	case XFRST_END:
 		FAIL(DNS_R_EXTRADATA);
 	default:
 		INSIST(0);
@@ -921,7 +908,8 @@ static void
 xfrin_connect_done(isc_task_t *task, isc_event_t *event) {
 	isc_socket_connev_t *cev = (isc_socket_connev_t *) event;
 	dns_xfrin_ctx_t *xfr = (dns_xfrin_ctx_t *) event->ev_arg;
-	isc_result_t result = cev->result;
+	isc_result_t evresult = cev->result;
+	isc_result_t result;
 	char sourcetext[ISC_SOCKADDR_FORMATSIZE];
 	isc_sockaddr_t sockaddr;

@@ -938,9 +926,7 @@ xfrin_connect_done(isc_task_t *task, isc_event_t *event) {
 		return;
 	}

-	if (result != ISC_R_SUCCESS)
-		goto failure;
-
+	CHECK(evresult);
 	result = isc_socket_getsockname(xfr->socket, &sockaddr);
 	if (result == ISC_R_SUCCESS) {
 		isc_sockaddr_format(&sockaddr, sourcetext, sizeof(sourcetext));
@@ -1224,7 +1210,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 			result = DNS_R_UNEXPECTEDID;
 		if (xfr->reqtype == dns_rdatatype_axfr ||
 		    xfr->reqtype == dns_rdatatype_soa)
-			goto failure;
+			FAIL(result);
 		xfrin_log(xfr, ISC_LOG_DEBUG(3), "got %s, retrying with AXFR",
 		       isc_result_totext(result));
 try_axfr:
@@ -1260,7 +1246,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 	if (result != ISC_R_SUCCESS) {
 		xfrin_log(xfr, ISC_LOG_DEBUG(3), "TSIG check failed: %s",
 		       isc_result_totext(result));
-		goto failure;
+		FAIL(result);
 	}

 	for (result = dns_message_firstname(msg, DNS_SECTION_ANSWER);
@@ -1308,9 +1294,8 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {

 	} else if (dns_message_gettsigkey(msg) != NULL) {
 		xfr->sincetsig++;
-		if (xfr->sincetsig > 100 || xfr->nmsg == 0 ||
-		    xfr->state == XFRST_AXFR_END ||
-		    xfr->state == XFRST_IXFR_END)
+		if (xfr->sincetsig > 100 ||
+		    xfr->nmsg == 0 || xfr->state == XFRST_END)
 		{
 			result = DNS_R_EXPECTEDTSIG;
 			goto failure;
@@ -1331,22 +1316,16 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {

 	dns_message_destroy(&msg);

-	switch (xfr->state) {
-	case XFRST_GOTSOA:
+	if (xfr->state == XFRST_GOTSOA) {
 		xfr->reqtype = dns_rdatatype_axfr;
 		xfr->state = XFRST_INITIALSOA;
 		CHECK(xfrin_send_request(xfr));
-		break;
-	case XFRST_AXFR_END:
-		CHECK(axfr_finalize(xfr));
-		/* FALLTHROUGH */
-	case XFRST_IXFR_END:
+	} else if (xfr->state == XFRST_END) {
 		/*
 		 * Close the journal.
 		 */
 		if (xfr->ixfr.journal != NULL)
 			dns_journal_destroy(&xfr->ixfr.journal);
-
 		/*
 		 * Inform the caller we succeeded.
 		 */
@@ -1360,8 +1339,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 		 */
 		xfr->shuttingdown = ISC_TRUE;
 		maybe_free(xfr);
-		break;
-	default:
+	} else {
 		/*
 		 * Read the next message.
 		 */
@@ -1,3 +1,3 @@
 LIBINTERFACE = 38
-LIBREVISION = 1
+LIBREVISION = 0
 LIBAGE = 2
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
 * Copyright (C) 1998-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: socket.c,v 1.237.18.72 2011/07/21 23:45:14 tbox Exp $ */
+/* $Id: socket.c,v 1.237.18.70 2010/12/22 23:45:17 tbox Exp $ */

 /*! \file */

@@ -1088,9 +1088,6 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
 #if defined(USE_CMSG) && defined(ISC_PLATFORM_HAVEIN6PKTINFO)
 	if ((sock->type == isc_sockettype_udp)
 	    && ((dev->attributes & ISC_SOCKEVENTATTR_PKTINFO) != 0)) {
-#if defined(IPV6_USE_MIN_MTU)
-		int use_min_mtu = 1;	/* -1, 0, 1 */
-#endif
 		struct cmsghdr *cmsgp;
 		struct in6_pktinfo *pktinfop;

@@ -1109,22 +1106,6 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
 		cmsgp->cmsg_len = cmsg_len(sizeof(struct in6_pktinfo));
 		pktinfop = (struct in6_pktinfo *)CMSG_DATA(cmsgp);
 		memcpy(pktinfop, &dev->pktinfo, sizeof(struct in6_pktinfo));
-#if defined(IPV6_USE_MIN_MTU)
-		/*
-		 * Set IPV6_USE_MIN_MTU as a per packet option as FreeBSD
-		 * ignores setsockopt(IPV6_USE_MIN_MTU) when IPV6_PKTINFO
-		 * is used.
-		 */
-		cmsgp = (struct cmsghdr *)(sock->sendcmsgbuf +
-					   msg->msg_controllen);
-		msg->msg_controllen += cmsg_space(sizeof(use_min_mtu));
-		INSIST(msg->msg_controllen <= sock->sendcmsgbuflen);
-
-		cmsgp->cmsg_level = IPPROTO_IPV6;
-		cmsgp->cmsg_type = IPV6_USE_MIN_MTU;
-		cmsgp->cmsg_len = cmsg_len(sizeof(use_min_mtu));
-		memcpy(CMSG_DATA(cmsgp), &use_min_mtu, sizeof(use_min_mtu));
-#endif
 	}
 #endif /* USE_CMSG && ISC_PLATFORM_HAVEIPV6 */
 #else /* ISC_NET_BSD44MSGHDR */
@@ -1743,14 +1724,7 @@ allocate_socket(isc_socketmgr_t *manager, isc_sockettype_t type,

 	cmsgbuflen = 0;
 #if defined(USE_CMSG) && defined(ISC_PLATFORM_HAVEIN6PKTINFO)
-	cmsgbuflen += cmsg_space(sizeof(struct in6_pktinfo));
-#if defined(IPV6_USE_MIN_MTU)
-	/*
-	 * Provide space for working around FreeBSD's broken IPV6_USE_MIN_MTU
-	 * support.
-	 */
-	cmsgbuflen += cmsg_space(sizeof(int));
-#endif
+	cmsgbuflen = cmsg_space(sizeof(struct in6_pktinfo));
 #endif
 	sock->sendcmsgbuflen = cmsgbuflen;
 	if (sock->sendcmsgbuflen != 0U) {
@@ -2081,18 +2055,10 @@ opensocket(isc_socketmgr_t *manager, isc_socket_t *sock) {
 #endif /* ISC_PLATFORM_HAVEIN6PKTINFO */
 #ifdef IPV6_USE_MIN_MTU        /* RFC 3542, not too common yet*/
 		/* use minimum MTU */
-		if (sock->pf == AF_INET6 &&
-		    setsockopt(sock->fd, IPPROTO_IPV6, IPV6_USE_MIN_MTU,
-			       (void *)&on, sizeof(on)) < 0) {
-			isc__strerror(errno, strbuf, sizeof(strbuf));
-			UNEXPECTED_ERROR(__FILE__, __LINE__,
-					 "setsockopt(%d, IPV6_USE_MIN_MTU) "
-					 "%s: %s", sock->fd,
-					 isc_msgcat_get(isc_msgcat,
-							ISC_MSGSET_GENERAL,
-							ISC_MSG_FAILED,
-							"failed"),
-					 strbuf);
+		if (sock->pf == AF_INET6) {
+			(void)setsockopt(sock->fd, IPPROTO_IPV6,
+					 IPV6_USE_MIN_MTU,
+					 (void *)&on, sizeof(on));
 		}
 #endif
 #endif /* ISC_PLATFORM_HAVEIPV6 */
@@ -654,9 +654,8 @@
 ./bin/tests/system/nsupdate/ns2/.cvsignore	X	2000,2001
 ./bin/tests/system/nsupdate/ns2/named.conf	CONF-C	2000,2001,2004,2007
 ./bin/tests/system/nsupdate/setup.sh		SH	2000,2001,2004
-./bin/tests/system/nsupdate/tests.sh		SH	2000,2001,2004,2011
+./bin/tests/system/nsupdate/tests.sh		SH	2000,2001,2004
 ./bin/tests/system/nsupdate/update_test.pl	PERL	2000,2001,2004
-./bin/tests/system/packet.pl			PERL	2011
 ./bin/tests/system/pending/clean.sh		SH	2009
 ./bin/tests/system/pending/ns1/named.conf	CONF-C	2009
 ./bin/tests/system/pending/ns1/root.db.in	ZONE	2009,2010
@@ -1913,7 +1912,7 @@
 ./lib/dns/lookup.c				C	2000,2001,2003,2004,2005,2007
 ./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2008,2009,2011
-./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
+./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ./lib/dns/name.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006
 ./lib/dns/ncache.c				C	1999,2000,2001,2002,2003,2004,2005,2010,2011
 ./lib/dns/nsec.c				C	1999,2000,2001,2003,2004,2005,2009
@@ -2069,7 +2068,7 @@
 ./lib/dns/win32/libdns.dsw			X	2001
 ./lib/dns/win32/libdns.mak			X	2001,2002,2003,2004,2005,2006
 ./lib/dns/win32/version.c			C	1998,1999,2000,2001,2004
-./lib/dns/xfrin.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011
+./lib/dns/xfrin.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008
 ./lib/dns/zone.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
 ./lib/dns/zonekey.c				C	2001,2003,2004,2005
 ./lib/dns/zt.c					C	1999,2000,2001,2002,2004,2005
@@ -2300,7 +2299,7 @@
 ./lib/isc/unix/net.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008
 ./lib/isc/unix/os.c				C	2000,2001,2004,2005
 ./lib/isc/unix/resource.c			C	2000,2001,2004,2008,2009
-./lib/isc/unix/socket.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
+./lib/isc/unix/socket.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./lib/isc/unix/socket_p.h			C	2000,2001,2004,2005,2008
 ./lib/isc/unix/stdio.c				C	2000,2001,2004,2011
 ./lib/isc/unix/stdtime.c			C	1999,2000,2001,2004,2005
@@ -1,4 +1,4 @@
-# $Id: version,v 1.29.134.35 2011/07/21 02:11:00 marka Exp $
+# $Id: version,v 1.29.134.34 2011/05/23 22:34:02 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=4
 PATCHVER=
 RELEASETYPE=-ESV
-RELEASEVER=-R5
+RELEASEVER=-R5rc1