From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 18 Jun 2019 08:30:12 +0000 (+0200)
Subject: Resolve merge errors.
X-Git-Tag: dnsdist-1.4.0-rc1~115^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fpdns.git;a=commitdiff_plain;h=5c4ff38c2366ec0f166264ac747b792cbefb53eb

Resolve merge errors.
---

diff --git a/pdns/recursordist/test-syncres_cc1.cc b/pdns/recursordist/test-syncres_cc1.cc
index 2d094bce5f..c735bb2228 100644
--- 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 5269e27211..b7334e4fca 100644
--- 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;