2678. [func] Treat DS queries as if "minimal-response yes;"

                        was set. [RT #20258]

2427.   [func]          Treat DNSKEY queries as if "minimal-response yes;"
                        was set. [RT #18528]

diff --git a/CHANGES b/CHANGES
index aff24d84cbf9821cfa66bd47352345af6c3bb715..b05e5a25040cd3ac71dd467a609969ac6e6793a5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,12 @@
 2890.  [bug]           Handle the introduction of new trusted-keys and
                        DS, DLV RRsets better. [RT #21097]
 
+2678.  [func]          Treat DS queries as if "minimal-response yes;"
+                       was set. [RT #20258]
+
+2427.  [func]          Treat DNSKEY queries as if "minimal-response yes;"
+                       was set. [RT #18528]
+
        --- 9.4-ESV-R2 released ---
 
 2876.  [bug]           Named could return SERVFAIL for negative responses

diff --git a/bin/named/query.c b/bin/named/query.c
index 363c95fa670b2142e35879a8f7146e98bb63cc18..147a6a404e3c100a7f26e8dee9c7c61a5b6c67a1 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.53 2009/12/30 08:55:48 jinmei Exp $ */
+/* $Id: query.c,v 1.257.18.54 2010/07/03 09:03:01 marka Exp $ */
 
 /*! \file */
 
@@ -4653,6 +4653,13 @@ ns_query_start(ns_client_t *client) {
                }
        }
 
+       /*
+        * Turn on minimal response for DNSKEY and DS queries.
+        */
+       if (qtype == dns_rdatatype_dnskey || qtype == dns_rdatatype_ds)
+               client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY |
+                                            NS_QUERYATTR_NOADDITIONAL);
+
        /*
         * If the client has requested that DNSSEC checking be disabled,
         * allow lookups to return pending data and instruct the resolver