]> granicus.if.org Git - pdns/commitdiff
Merge pull request #7714 from rgacogne/rec-non-expanded-wildcard
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Fri, 26 Apr 2019 13:04:16 +0000 (15:04 +0200)
committerGitHub <noreply@github.com>
Fri, 26 Apr 2019 13:04:16 +0000 (15:04 +0200)
 rec: Fix DNSSEC validation of non-expanded wildcards

1  2 
pdns/recursordist/test-syncres_cc.cc
pdns/syncres.cc
pdns/syncres.hh

Simple merge
diff --cc pdns/syncres.cc
index 68734804d257bd061f6de9500e5183bb0cf6c4b5,72b67e56d20cd58428ca699e2f6e31e9025b0b82..5dd3c98a39fefc6d2d0baecf51328714b50a1d25
@@@ -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)
diff --cc pdns/syncres.hh
Simple merge