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 23e87b6ac5a4e8cbaac54751304eda15ce3c69c3..d9a45a254e8284d1af860e7166f622cc2799c25a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+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.5.2rc1 released ---
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 0aa38bf4e398fa6192b33b1e1ebd4bf9ee6fd4c4..08dc9c3f019738bd2e9016b0a472618166ac25a3 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.298.48.14 2009/02/15 23:07:53 marka Exp $ */
+/* $Id: query.c,v 1.298.48.15 2009/09/16 22:28:52 marka Exp $ */
 
 /*! \file */
 
@@ -4675,6 +4675,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