From: Remi Gacogne <rgacogne@users.noreply.github.com>
Date: Fri, 26 Apr 2019 13:04:16 +0000 (+0200)
Subject: Merge pull request #7714 from rgacogne/rec-non-expanded-wildcard
X-Git-Tag: rec-4.2.0-beta1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e919a398231e890a38d4d15e751782d0cb933b19;p=pdns

Merge pull request #7714 from rgacogne/rec-non-expanded-wildcard

 rec: Fix DNSSEC validation of non-expanded wildcards
---

e919a398231e890a38d4d15e751782d0cb933b19
diff --cc pdns/syncres.cc
index 68734804d,72b67e56d..5dd3c98a3
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@@ -2572,11 -2494,9 +2583,11 @@@ dState SyncRes::getDenialValidationStat
    return getDenial(csp, ne.d_name, ne.d_qtype.getCode(), referralToUnsigned, expectedState == NXQTYPE);
  }
  
- bool SyncRes::processRecords(const std::string& prefix, const DNSName& qname, const QType& qtype, const DNSName& auth, LWResult& lwr, const bool sendRDQuery, vector<DNSRecord>& ret, set<DNSName>& nsset, DNSName& newtarget, DNSName& newauth, bool& realreferral, bool& negindic, vState& state, const bool needWildcardProof, const unsigned int wildcardLabelsCount)
+ bool SyncRes::processRecords(const std::string& prefix, const DNSName& qname, const QType& qtype, const DNSName& auth, LWResult& lwr, const bool sendRDQuery, vector<DNSRecord>& ret, set<DNSName>& nsset, DNSName& newtarget, DNSName& newauth, bool& realreferral, bool& negindic, vState& state, const bool needWildcardProof, const bool gatherWildcardProof, const unsigned int wildcardLabelsCount)
  {
    bool done = false;
 +  DNSName dnameTarget, dnameOwner;
 +  uint32_t dnameTTL = 0;
  
    for(auto& rec : lwr.d_records) {
      if (rec.d_type!=QType::OPT && rec.d_class!=QClass::IN)