Resolve merge errors.

diff --git a/pdns/recursordist/test-syncres_cc1.cc b/pdns/recursordist/test-syncres_cc1.cc
index 2d094bce5f69c8b12d48e22a34aaea1af44b0d08..c735bb22282c6b5604570a197bda260b3d334df8 100644 (file)
--- a/pdns/recursordist/test-syncres_cc1.cc
+++ b/pdns/recursordist/test-syncres_cc1.cc
@@ -130,7 +130,7 @@ static void test_edns_formerr_fallback_f(bool sample) {
   std::unique_ptr<SyncRes> sr;
   initSR(sr);
   if (sample) {
-    setDoQNameMinimisation();
+    sr->setQNameMinimization();
   }
   ComboAddress noEDNSServer;
   size_t queriesWithEDNS = 0;
@@ -153,7 +153,7 @@ static void test_edns_formerr_fallback_f(bool sample) {
         return 1;
       }
 
-      return sample ? basicRecordsForQnameMinimisation(res, domain, type) : 0;
+      return sample ? basicRecordsForQnameMinimization(res, domain, type) : 0;
     });
 
   primeHints();

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 5269e272111027f3ca982fc3e4fc3ed0f701a33f..b7334e4fcaa0ca6e16c804a79b035234ecbfa51b 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -754,7 +754,6 @@ int SyncRes::doResolveNoQNameMinimization(const DNSName &qname, const QType &qty
     }
   }
 
-  if(d_cacheonly)
   if(d_cacheonly)
     return 0;