From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 2 May 2018 06:48:44 +0000 (+0530)
Subject: Don't validate non-pending glue when adding to the additional section
X-Git-Tag: v9.13.0~14^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31bd3147d118106faa62fe90ec39f36c64239e5d;p=thirdparty%2Fbind9.git

Don't validate non-pending glue when adding to the additional section
---

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 21f1860bb61..d6e9a4dffdc 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -1880,8 +1880,7 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
 			mname = NULL;
 			have_a = ISC_TRUE;
 			if (additionaltype == dns_rdatasetadditional_fromcache &&
-			    (DNS_TRUST_PENDING(rdataset->trust) ||
-			     DNS_TRUST_GLUE(rdataset->trust)) &&
+			    DNS_TRUST_PENDING(rdataset->trust) &&
 			    !validate(client, db, fname, rdataset, sigrdataset))
 			{
 				dns_rdataset_disassociate(rdataset);
@@ -1945,8 +1944,7 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
 			      !dns_rdataset_isassociated(sigrdataset)))))
 				goto addname;
 			if (additionaltype == dns_rdatasetadditional_fromcache &&
-			    (DNS_TRUST_PENDING(rdataset->trust) ||
-			     DNS_TRUST_GLUE(rdataset->trust)) &&
+			    DNS_TRUST_PENDING(rdataset->trust) &&
 			    !validate(client, db, fname, rdataset, sigrdataset))
 			{
 				dns_rdataset_disassociate(rdataset);