From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sat, 19 Jun 2010 13:18:12 +0000 (+0000)
Subject: fix up nsec getbeforeafter for bind backend so we generate the correct nsec again
X-Git-Tag: rec-3.3~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31fc0e5664396fe5ea69b54a45a7985a3e9945cb;p=pdns

fix up nsec getbeforeafter for bind backend so we generate the correct nsec again


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1646 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 992035349..4978b4e8b 100644
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -782,8 +782,7 @@ void Bind2Backend::queueReload(BB2DomainInfo *bbd)
 }
 
 
-
-bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string& qname, std::string& before, std::string& after)
+bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string& qname, std::string& unhashed, std::string& before, std::string& after)
 {
   shared_ptr<State> state = s_state;
 
@@ -795,7 +794,6 @@ bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string
 
   vector<Bind2DNSRecord>::const_iterator iter = lower_bound(bbd.d_records->begin(), bbd.d_records->end(), lname);
 
-  
   while(iter != bbd.d_records->begin() && !(iter-1)->auth && (iter-1)->qtype!=QType::NS) {
     cerr<<"Going backwards.."<<endl;
     iter--;
@@ -830,8 +828,6 @@ bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string
 
   cerr<<"Before: '"<<before<<"', after: '"<<after<<"'\n";
   return true;
- 
-  
 }
 
 void Bind2Backend::lookup(const QType &qtype, const string &qname, DNSPacket *pkt_p, int zoneId )
diff --git a/pdns/backends/bind/bindbackend2.hh b/pdns/backends/bind/bindbackend2.hh
index baf1a2d6b..4520be372 100644
--- a/pdns/backends/bind/bindbackend2.hh
+++ b/pdns/backends/bind/bindbackend2.hh
@@ -108,7 +108,7 @@ public:
   void getUpdatedMasters(vector<DomainInfo> *changedDomains);
   bool getDomainInfo(const string &domain, DomainInfo &di);
   time_t getCtime(const string &fname);
-  virtual bool getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string& qname, std::string& before, std::string& after);
+  virtual bool getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string& qname, std::string& unhashed, std::string& before, std::string& after);
   void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
   bool list(const string &target, int id);
   bool get(DNSResourceRecord &);