Merge pull request #5993 from zeha/ecs-add-for

Recursor: add ecs-add-for option

diff --cc pdns/pdns_recursor.cc
Simple merge

diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge

diff --cc pdns/sdig.cc
Simple merge

diff --cc pdns/syncres.cc
index f31621e023dedd91eafaefdb81943e92231f39ba,4f4fc7d8d6424a84da7beaf48f1efbfce6d43be4..bd13b80772ec2dfe1c58f3f41047429081b7f6f0
--- 1/pdns/syncres.cc
--- 2/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@@ -894,13 -895,9 +895,13 @@@ bool SyncRes::doCNAMECacheCheck(const D
    vector<std::shared_ptr<RRSIGRecordContent>> signatures;
    vector<std::shared_ptr<DNSRecord>> authorityRecs;
    bool wasAuth;
-   if(t_RC->get(d_now.tv_sec, qname, QType(QType::CNAME), d_requireAuthData, &cset, d_incomingECSFound ? d_incomingECSNetwork : d_requestor, d_doDNSSEC ? &signatures : nullptr, d_doDNSSEC ? &authorityRecs : nullptr, &d_wasVariable, &state, &wasAuth) > 0) {
+   if(t_RC->get(d_now.tv_sec, qname, QType(QType::CNAME), d_requireAuthData, &cset, d_cacheRemote, d_doDNSSEC ? &signatures : nullptr, d_doDNSSEC ? &authorityRecs : nullptr, &d_wasVariable, &state, &wasAuth) > 0) {
  
      for(auto j=cset.cbegin() ; j != cset.cend() ; ++j) {
 +      if (j->d_class != QClass::IN) {
 +        continue;
 +      }
 +
        if(j->d_ttl>(unsigned int) d_now.tv_sec) {
  
          if (!wasAuthZone && shouldValidate() && wasAuth && state == Indeterminate && d_requireAuthData) {

diff --cc pdns/syncres.hh
Simple merge

diff --cc regression-tests.recursor-dnssec/recursortests.py
Simple merge

diff --cc regression-tests.recursor-dnssec/test_ECS.py
Simple merge