From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 22 Dec 2020 16:51:59 +0000 (+0100)
Subject: rec: Fix wrong NSEC generation (zone cut) in a unit test
X-Git-Tag: dnsdist-1.6.0-alpha2~12^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=399e12096a8af6462ea6deed085f1bb33faa70e2;p=thirdparty%2Fpdns.git

rec: Fix wrong NSEC generation (zone cut) in a unit test
---

diff --git a/pdns/recursordist/test-syncres_cc4.cc b/pdns/recursordist/test-syncres_cc4.cc
index aace7bf65a..4a2ec2d608 100644
--- a/pdns/recursordist/test-syncres_cc4.cc
+++ b/pdns/recursordist/test-syncres_cc4.cc
@@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_nx)
 BOOST_AUTO_TEST_CASE(test_auth_zone_delegation)
 {
   std::unique_ptr<SyncRes> sr;
-  initSR(sr, true, false);
+  initSR(sr, true);
 
   primeHints();
 
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_delegation)
   sr->setAsyncCallback([&queriesCount, target, targetAddr, nsAddr, authZone, keys, fixedNow](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, LWResult* res, bool* chained) {
     queriesCount++;
     if (type == QType::DS || type == QType::DNSKEY) {
-      return genericDSAndDNSKEYHandler(res, domain, DNSName("."), type, keys, domain == authZone, fixedNow);
+      return genericDSAndDNSKEYHandler(res, domain, DNSName("."), type, keys, domain == DNSName("com.") || domain == authZone, fixedNow);
     }
 
     if (ip == ComboAddress(nsAddr.toString(), 53) && domain == target) {
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_delegation)
   BOOST_CHECK_EQUAL(res, RCode::NoError);
   BOOST_REQUIRE_EQUAL(ret.size(), 1U);
   BOOST_CHECK(ret[0].d_type == QType::A);
-  BOOST_CHECK_EQUAL(queriesCount, 4U);
+  BOOST_CHECK_EQUAL(queriesCount, 3U);
   BOOST_CHECK_EQUAL(sr->getValidationState(), vState::Indeterminate);
 }