From 095dd41ba333216c844ca2daa1db300f7a0a56b7 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 13 Jul 2020 17:01:22 +0200
Subject: [PATCH] Fix merge

---
 pdns/syncres.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index b23096a09b..410a606bc4 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -1792,7 +1792,8 @@ vState SyncRes::getDSRecords(const DNSName& zone, dsmap_t& ds, bool taOnly, unsi
   std::vector<DNSRecord> dsrecords;
 
   vState state = Indeterminate;
-  const bool oldCacheOnly = setCacheOnly(false);
+  const bool oldCacheOnly = d_cacheonly;
+  setCacheOnly(false);
   int rcode = doResolve(zone, QType(QType::DS), dsrecords, depth + 1, beenthere, state);
   d_skipCNAMECheck = oldSkipCNAME;
   setCacheOnly(oldCacheOnly);
@@ -2068,7 +2069,8 @@ vState SyncRes::getDNSKeys(const DNSName& signer, skeyset_t& keys, unsigned int
   /* following CNAME might lead to us to the wrong DNSKEY */
   bool oldSkipCNAME = d_skipCNAMECheck;
   d_skipCNAMECheck = true;
-  const bool oldCacheOnly = setCacheOnly(false);
+  const bool oldCacheOnly = d_cacheonly;
+  setCacheOnly(false);
   int rcode = doResolve(signer, QType(QType::DNSKEY), records, depth + 1, beenthere, state);
   d_skipCNAMECheck = oldSkipCNAME;
   setCacheOnly(oldCacheOnly);
-- 
2.47.2