2110. [bug] "minimal-response yes;" interacted badly with BIND 8

                        priming queries. [RT #16491]

diff --git a/CHANGES b/CHANGES
index fc0380e5a2e2d4c9d9d4285d9cb89256fe343b9a..2595e0a7d2e24842c42ce7f0d10c17197d184459 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2110.  [bug]           "minimal-response yes;" interacted badly with BIND 8
+                       priming queries. [RT #16491]
+
 2109.  [port]          libbind: silence aix 5.3 compiler warnings. [RT #16502]
 
 2107.  [bug]           dighost.c: more cleanup of buffers. [RT #16499]

diff --git a/bin/named/query.c b/bin/named/query.c
index 13151bfb83dc20c28feef5be28edae677358dd54..29a62f07925e019b815737dfdcb917a885f6fe01 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.257.18.33 2006/08/31 03:57:05 marka Exp $ */
+/* $Id: query.c,v 1.257.18.34 2006/12/07 04:38:39 marka Exp $ */
 
 /*! \file */
 
@@ -4244,6 +4244,13 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                        noqname = rdataset;
                else
                        noqname = NULL;
+               /*
+                * BIND 8 priming queries need the additional section.
+                */
+               if (is_zone && qtype == dns_rdatatype_ns &&
+                   dns_name_equal(client->query.qname, dns_rootname))
+                       client->query.attributes &= ~NS_QUERYATTR_NOADDITIONAL;
+
                query_addrrset(client, &fname, &rdataset, sigrdatasetp, dbuf,
                               DNS_SECTION_ANSWER);
                if (noqname != NULL)