]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #10282 from omoerbeek/qtype-tostring dnsdist-1.7.0-alpha0
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 18 May 2021 16:57:15 +0000 (18:57 +0200)
committerGitHub <noreply@github.com>
Tue, 18 May 2021 16:57:15 +0000 (18:57 +0200)
Rename QType.getName() to QType.toString()

13 files changed:
1  2 
pdns/backends/gsql/gsqlbackend.cc
pdns/common_startup.cc
pdns/dnsdist-lua-actions.cc
pdns/dnsdistdist/doh.cc
pdns/filterpo.cc
pdns/lua-record.cc
pdns/pdns_recursor.cc
pdns/pdnsutil.cc
pdns/recursordist/aggressive_nsec.cc
pdns/recursordist/test-syncres_cc3.cc
pdns/syncres.cc
pdns/tcpreceiver.cc
pdns/validate.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pdns/syncres.cc
Simple merge
Simple merge
index 3e48f0f13be54afd3d1b9e4b18ff7ad522ad11a5,8d18956a02ab97d5b52dd3536dfd5629419de41d..6190f81e4873fabbf5b5222d26563510350e8238
@@@ -452,10 -452,10 +452,10 @@@ dState matchesNSEC(const DNSName& name
    }
  
    if (isCoveredByNSEC(name, owner, nsec->d_next)) {
 -    LOG(name<<" is covered ");
 +    LOG(name<<" is covered by ("<<owner<<" to "<<nsec->d_next<<") ");
  
      if (nsecProvesENT(name, owner, nsec->d_next)) {
-       LOG("Denies existence of type "<<name<<"/"<<QType(qtype).getName()<<" by proving that "<<name<<" is an ENT"<<endl);
+       LOG("Denies existence of type "<<name<<"/"<<QType(qtype).toString()<<" by proving that "<<name<<" is an ENT"<<endl);
        return dState::NXQTYPE;
      }