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 7c5b8b5cdfc27c0e87822ea6904c55955046ba53..4bd275ce9d8da4bfac3486c46602e180657478b5 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 071ffe2efc40c9d726e7a53f88c885fb5a8776db..fd4640eb80317df3aee92b6c64b587cc6f36d2d5 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.425 2010/07/11 00:12:57 each Exp $ */
+/* $Id: resolver.c,v 1.426 2010/09/15 12:21:27 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;