2427. [func] Treat DNSKEY queries as if "minimal-response yes;"

                        was set. [RT #18528]

diff --git a/CHANGES b/CHANGES
index c0a40085ed182b809059336daedba9ad674ac902..36ee0d9b868f7c7f7ffcf729db78ce9f511e347d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2427.  [func]          Treat DNSKEY queries as if "minimal-response yes;"
+                       was set. [RT #18528]
+
 2426.  [bug]           libbind: inet_net_pton() can sometimes return the
                        wrong value if excessively large netmasks are
                        supplied. [RT #18512]

diff --git a/bin/named/query.c b/bin/named/query.c
index ccd4a036fb66503fd6c80c742f1a659330f45a58..1f1b052f2cadbb4d744dd6004536caa213d1bd0c 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.307 2008/04/29 00:54:28 marka Exp $ */
+/* $Id: query.c,v 1.308 2008/08/26 06:09:18 marka Exp $ */
 
 /*! \file */
 
@@ -4609,6 +4609,13 @@ ns_query_start(ns_client_t *client) {
                }
        }
 
+       /*
+        * Turn on minimal response for DNSKEY queries.
+        */
+       if (qtype == dns_rdatatype_dnskey)
+               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