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

(cherry picked from commit 31bd3147d118106faa62fe90ec39f36c64239e5d)

diff --git a/bin/named/query.c b/bin/named/query.c
index 6b3d79806564e93cb978e69bcf627ee937c9fb21..ae1ae76d40e71dfd657cb7cd0701c424922b69fb 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1625,8 +1625,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
                        have_a = ISC_TRUE;
 #endif
                        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);
@@ -1696,8 +1695,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
                                goto addname;
 #endif
                        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);