]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix acache case too
authorMukund Sivaraman <muks@isc.org>
Wed, 16 May 2018 07:33:00 +0000 (13:03 +0530)
committerMark Andrews <marka@isc.org>
Mon, 4 Jun 2018 05:12:18 +0000 (01:12 -0400)
bin/named/query.c

index ae1ae76d40e71dfd657cb7cd0701c424922b69fb..44caf79ff5ab3aceb8b7fb3ef536bf50658d9ffb 100644 (file)
@@ -2162,9 +2162,9 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
         */
        if (result == ISC_R_SUCCESS &&
            additionaltype == dns_rdatasetadditional_fromcache &&
-           (DNS_TRUST_PENDING(rdataset->trust) ||
-            DNS_TRUST_GLUE(rdataset->trust)) &&
-           !validate(client, db, fname, rdataset, sigrdataset)) {
+           DNS_TRUST_PENDING(rdataset->trust) &&
+           !validate(client, db, fname, rdataset, sigrdataset))
+       {
                dns_rdataset_disassociate(rdataset);
                if (dns_rdataset_isassociated(sigrdataset))
                        dns_rdataset_disassociate(sigrdataset);
@@ -2204,9 +2204,9 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
         */
        if (result == ISC_R_SUCCESS &&
            additionaltype == dns_rdatasetadditional_fromcache &&
-           (DNS_TRUST_PENDING(rdataset->trust) ||
-            DNS_TRUST_GLUE(rdataset->trust)) &&
-           !validate(client, db, fname, rdataset, sigrdataset)) {
+           DNS_TRUST_PENDING(rdataset->trust) &&
+           !validate(client, db, fname, rdataset, sigrdataset))
+       {
                dns_rdataset_disassociate(rdataset);
                if (dns_rdataset_isassociated(sigrdataset))
                        dns_rdataset_disassociate(sigrdataset);