From: Mark Andrews <marka@isc.org>
Date: Wed, 16 Sep 2009 22:28:52 +0000 (+0000)
Subject: 2678.   [func]          Treat DS queries as if "minimal-response yes;"
X-Git-Tag: v9.5.2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cef43239cb9622b261e8d2537557435a4cbaf73d;p=thirdparty%2Fbind9.git

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 23e87b6ac5a..d9a45a254e8 100644
--- 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 0aa38bf4e39..08dc9c3f019 100644
--- 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