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

31bd3147 · Mukund Sivaraman · Ondřej Surý · f03d68a7 · 31bd3147
Commit 31bd3147 authored May 02, 2018 by Mukund Sivaraman Committed by Ondřej Surý May 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

lib/ns/query.c lib/ns/query.c +2 -4

No files found.
--- 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);