--- 9.9.0b2 released ---

3219.   [bug]           Disable NOEDNS caching following a timeout.

diff --git a/CHANGES b/CHANGES
index ff110c319a2397613f0d695af5b2bc7ec4d7a6e8..970ec3767eeacc378caa85cc231e738b2dfa17bd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+       --- 9.9.0b2 released ---
+
+3219.  [bug]           Disable NOEDNS caching following a timeout.
+
 3218.  [security]      Cache lookup could return RRSIG data associated with
                        nonexistent records, leading to an assertion
                        failure. [RT #26590]

diff --git a/lib/bind9/api b/lib/bind9/api
index 3d2fa6efd1d29eec772f4b04e14754d09b5411ca..6404d993e5993844fb74f155c1371c9f5936bd5c 100644 (file)
--- a/lib/bind9/api
+++ b/lib/bind9/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 90
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0

diff --git a/lib/dns/api b/lib/dns/api
index 3d2fa6efd1d29eec772f4b04e14754d09b5411ca..580ddcfd7ae79711750096cc5db47e8e03cb80b0 100644 (file)
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -1,3 +1,3 @@
-LIBINTERFACE = 90
+LIBINTERFACE = 91
 LIBREVISION = 0
-LIBAGE = 0
+LIBAGE = 1

diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index ec676ee88806ef3d808b8a8bc1480606122bfd4e..ea024982eeebec77f757a40585c94db83d2ab3db 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.70 2011/11/04 03:38:44 marka Exp $ */
+/* $Id: resolver.h,v 1.71 2011/11/16 22:18:52 marka Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1
@@ -96,7 +96,7 @@ typedef struct dns_fetchevent {
 #define DNS_FETCHOPT_EDNS512           0x40         /*%< Advertise a 512 byte
                                                          UDP buffer. */
 #define DNS_FETCHOPT_WANTNSID           0x80         /*%< Request NSID */
-#define DNS_FETCHOPT_CACHENOEDNS        0x100A      /*%< This is a candidate
+#define DNS_FETCHOPT_CACHENOEDNS        0x100       /*%< This is a candidate
                                                          for setting NOEDNS
                                                          in adb. */
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 266ea01a95e04339dc595562db931bfa937e6fc7..e6933f3f2e0921d7758e5dabc1d6c020a1d3fff2 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.441 2011/11/15 21:44:53 each Exp $ */
+/* $Id: resolver.c,v 1.442 2011/11/16 22:18:52 marka Exp $ */
 
 /*! \file */
 
@@ -6580,6 +6580,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                        }
                }
                goto done;
+#if 0
        } else if ((query->options & DNS_FETCHOPT_NOEDNS0) != 0 &&
                   (query->options & DNS_FETCHOPT_CACHENOEDNS) != 0 &&
                   triededns512(fctx, &query->addrinfo->sockaddr)) {
@@ -6597,6 +6598,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                dns_adb_changeflags(fctx->adb, query->addrinfo,
                                    DNS_FETCHOPT_NOEDNS0,
                                    DNS_FETCHOPT_NOEDNS0);
+#endif
        }
 
        message = fctx->rmessage;

diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 5eaaad721940eac97651b5c150073f5de6fdbf60..7ddceb0bcd188e35e0cecdc0fe77d7ca96e59ab0 100644 (file)
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -932,6 +932,8 @@ dns_zonemgr_setsize
 dns_zonemgr_settransfersin
 dns_zonemgr_settransfersperns
 dns_zonemgr_shutdown
+dns_zonemgr_unreachable
+dns_zonemgr_unreachabledel
 dns_zt_apply
 dns_zt_attach
 dns_zt_create

diff --git a/lib/isc/api b/lib/isc/api
index 3d2fa6efd1d29eec772f4b04e14754d09b5411ca..6404d993e5993844fb74f155c1371c9f5936bd5c 100644 (file)
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 90
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0

diff --git a/lib/isccfg/api b/lib/isccfg/api
index 3d2fa6efd1d29eec772f4b04e14754d09b5411ca..6404d993e5993844fb74f155c1371c9f5936bd5c 100644 (file)
--- a/lib/isccfg/api
+++ b/lib/isccfg/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 90
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0

diff --git a/version b/version
index 780e332cdfbb64d2f19becb3999aac84d178441c..cb38a921a02f50ccc9fa3f8c7d90f1e669fef6f5 100644 (file)
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.57 2011/10/28 12:02:31 marka Exp $
+# $Id: version,v 1.58 2011/11/16 22:18:51 marka Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=9
 PATCHVER=0
 RELEASETYPE=b
-RELEASEVER=1
+RELEASEVER=2