From 31bd3147d118106faa62fe90ec39f36c64239e5d Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 2 May 2018 12:18:44 +0530 Subject: [PATCH] Don't validate non-pending glue when adding to the additional section --- lib/ns/query.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ns/query.c b/lib/ns/query.c index 21f1860bb6..d6e9a4dffd 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);