2961. [bug] Be still more selective about the non-authoritative

                        answers we apply change 2748 to. [RT #22074]

diff --git a/CHANGES b/CHANGES
index ea1b61990ca30a5e202a3f311d7a02004fe125e3..cadc1368224be450b36c09a92ed6f624fdc0529a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2961.  [bug]           Be still more selective about the non-authoritative
+                       answers we apply change 2748 to. [RT #22074]
+
 2960.  [func]          Check that named accepts non-authoritative answers.
                        [RT #21594]
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 60274a31894b5324157a8d8e0b3e65fe4a36ce3a..89b5887266d73b7c2ef4864eba10aca8a2157ce5 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.413.14.11.6.1 2010/09/13 22:49:34 marka Exp $ */
+/* $Id: resolver.c,v 1.413.14.11.6.2 2010/09/15 12:24:38 marka Exp $ */
 
 /*! \file */
 
@@ -6462,7 +6462,7 @@ betterreferral(fetchctx_t *fctx) {
             result = dns_message_nextname(message, DNS_SECTION_AUTHORITY)) {
                name = NULL;
                dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name);
-               if (!dns_name_issubdomain(name, &fctx->domain))
+               if (!isstrictsubdomain(name, &fctx->domain))
                        continue;
                for (rdataset = ISC_LIST_HEAD(name->list);
                     rdataset != NULL;