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 21f1860bb61ba8c13bc14d35ad1b51434813710f..d6e9a4dffdc6827804dc3248c539e726430ca219 100644 (file)
--- 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);