From: Otto <otto.moerbeek@open-xchange.com>
Date: Fri, 26 Mar 2021 08:44:00 +0000 (+0100)
Subject: Resolve merge issues
X-Git-Tag: rec-4.4.3~4^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee1551c9c46565df1da4ca5f345217eb9ff77d3;p=thirdparty%2Fpdns.git

Resolve merge issues
---

diff --git a/pdns/recursordist/test-syncres_cc7.cc b/pdns/recursordist/test-syncres_cc7.cc
index b21e2f1740..eb63028c1d 100644
--- a/pdns/recursordist/test-syncres_cc7.cc
+++ b/pdns/recursordist/test-syncres_cc7.cc
@@ -1493,12 +1493,12 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex)
         setLWResult(res, 0, true, false, true);
         addDNSKEY(keys, domain, 300, res->d_records);
         addRRSIG(keys, res->d_records, domain, 300);
-        return LWResult::Result::Success;
+        return 1;
       }
       else {
         setLWResult(res, 0, true, false, true);
         addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600);
-        return LWResult::Result::Success;
+        return 1;
       }
     }
     else {
@@ -1508,7 +1508,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex)
         addDS(DNSName("com."), 300, res->d_records, keys);
         addRRSIG(keys, res->d_records, DNSName("."), 300);
         addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600);
-        return LWResult::Result::Success;
+        return 1;
       }
       else if (ip == ComboAddress("192.0.2.1:53")) {
         setLWResult(res, 0, false, false, true);
@@ -1531,7 +1531,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex)
           addRecordToLW(res, "ns1.powerdns.com.", QType::A, "192.0.2.2", DNSResourceRecord::ADDITIONAL, 3600);
         }
 
-        return LWResult::Result::Success;
+        return 1;
       }
       else if (ip == ComboAddress("192.0.2.2:53")) {
         setLWResult(res, 0, true, false, true);
@@ -1552,11 +1552,11 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex)
           }
         }
 
-        return LWResult::Result::Success;
+        return 1;
       }
     }
 
-    return LWResult::Result::Timeout;
+    return 0;
   });
 
   vector<DNSRecord> ret;
@@ -1583,7 +1583,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex)
   BOOST_CHECK_EQUAL(queriesCount, 11U);
 
   /* now we remove the denial of powerdns.com DS from the cache and ask www2 */
-  BOOST_REQUIRE_EQUAL(g_negCache->wipe(target, false), 1);
+  BOOST_REQUIRE_EQUAL(sr->t_sstorage.negcache.wipe(target, false), 1);
   ret.clear();
   res = sr->beginResolve(DNSName("www2.powerdns.com."), QType(QType::A), QClass::IN, ret);
   BOOST_CHECK_EQUAL(res, RCode::NoError);
@@ -1634,12 +1634,12 @@ BOOST_AUTO_TEST_CASE(test_dnssec_cname_inside_secure_zone)
         setLWResult(res, 0, true, false, true);
         addDNSKEY(keys, domain, 300, res->d_records);
         addRRSIG(keys, res->d_records, domain, 300);
-        return LWResult::Result::Success;
+        return 1;
       }
       else {
         setLWResult(res, 0, true, false, true);
         addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600);
-        return LWResult::Result::Success;
+        return 1;
       }
     }
     else {
@@ -1649,7 +1649,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_cname_inside_secure_zone)
         addDS(DNSName("com."), 300, res->d_records, keys);
         addRRSIG(keys, res->d_records, DNSName("."), 300);
         addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600);
-        return LWResult::Result::Success;
+        return 1;
       }
       else if (ip == ComboAddress("192.0.2.1:53")) {
         setLWResult(res, 0, true, false, true);
@@ -1675,11 +1675,11 @@ BOOST_AUTO_TEST_CASE(test_dnssec_cname_inside_secure_zone)
           }
         }
 
-        return LWResult::Result::Success;
+        return 1;
       }
     }
 
-    return LWResult::Result::Timeout;
+    return 0;
   });
 
   vector<DNSRecord> ret;
@@ -1706,7 +1706,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_cname_inside_secure_zone)
   BOOST_CHECK_EQUAL(queriesCount, 10U);
 
   /* now we remove the denial of powerdns.com DS from the cache and ask www2 */
-  BOOST_REQUIRE_EQUAL(g_negCache->wipe(target, false), 1);
+  BOOST_REQUIRE_EQUAL(sr->t_sstorage.negcache.wipe(target, false), 1);
   ret.clear();
   res = sr->beginResolve(DNSName("www2.powerdns.com."), QType(QType::A), QClass::IN, ret);
   BOOST_CHECK_EQUAL(res, RCode::NoError);