From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 3 Jul 2020 15:29:33 +0000 (+0200)
Subject: rec: Ignore cache-only for DNSKEYs retrieval
X-Git-Tag: rec-4.3.3~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=139afb32e5ade4d89b495dc32db0448881aeeb09;p=thirdparty%2Fpdns.git

rec: Ignore cache-only for DNSKEYs retrieval

When the DNSKEYs are needed for validation, the initial RD flag
should not prevent us from going to the network.

(cherry picked from commit 38a7e82df8eaa8bee8fe9b444e81e1d71710d4de)
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index cd86a67f9f..0121c05acf 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -2326,11 +2326,14 @@ vState SyncRes::getDNSKeys(const DNSName& signer, skeyset_t& keys, unsigned int
   LOG(d_prefix<<"Retrieving DNSKeys for "<<signer<<endl);
 
   vState state = Indeterminate;
+
   /* following CNAME might lead to us to the wrong DNSKEY */
   bool oldSkipCNAME = d_skipCNAMECheck;
   d_skipCNAMECheck = true;
+  const bool oldCacheOnly = setCacheOnly(false);
   int rcode = doResolve(signer, QType(QType::DNSKEY), records, depth + 1, beenthere, state);
   d_skipCNAMECheck = oldSkipCNAME;
+  setCacheOnly(oldCacheOnly);
 
   if (rcode == RCode::NoError) {
     if (state == Secure) {