]> granicus.if.org Git - pdns/commitdiff
Merge pull request #4606 from mind04/nsec-dnsname
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 27 Dec 2016 06:28:21 +0000 (07:28 +0100)
committerGitHub <noreply@github.com>
Tue, 27 Dec 2016 06:28:21 +0000 (07:28 +0100)
Use dnsname for nsec generation

17 files changed:
1  2 
modules/bindbackend/bindbackend2.cc
modules/bindbackend/bindbackend2.hh
modules/luabackend/dnssec.cc
modules/luabackend/luabackend.hh
modules/oraclebackend/oraclebackend.cc
modules/oraclebackend/oraclebackend.hh
modules/remotebackend/remotebackend.cc
modules/remotebackend/remotebackend.hh
modules/remotebackend/test-remotebackend.cc
pdns/backends/gsql/gsqlbackend.cc
pdns/backends/gsql/gsqlbackend.hh
pdns/dnsbackend.hh
pdns/dnsname.hh
pdns/packethandler.cc
pdns/pdnsutil.cc
pdns/rfc2136handler.cc
pdns/test-dnsname_cc.cc

Simple merge
Simple merge
Simple merge
Simple merge
index 1176dff417e728e00ff3a26a2e2951cdae7a7153,3a7182afebb8e86dc24507c261960fea78f7f344..412af6454144d450ca586c2b5e5233fc994af8e7
@@@ -160,9 -160,9 +160,9 @@@ class RemoteBackend : public DNSBacken
  
    virtual bool getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta);
    virtual bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta);
 -  virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<DNSBackend::KeyData>& keys);
 +  virtual bool getDomainKeys(const DNSName& name, std::vector<DNSBackend::KeyData>& keys);
    virtual bool getTSIGKey(const DNSName& name, DNSName* algorithm, std::string* content);
-   virtual bool getBeforeAndAfterNamesAbsolute(uint32_t id, const string& qname, DNSName& unhashed, string& before, string& after);
+   virtual bool getBeforeAndAfterNamesAbsolute(uint32_t id, const DNSName& qname, DNSName& unhashed, DNSName& before, DNSName& after);
    virtual bool setDomainMetadata(const DNSName& name, const string& kind, const std::vector<std::basic_string<char> >& meta);
    virtual bool removeDomainKey(const DNSName& name, unsigned int id);
    virtual bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id);
Simple merge
Simple merge
Simple merge
diff --cc pdns/dnsname.hh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge