cleanup (Kees Monshouwer)

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

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index e5771e4df2f1577ec9903bf07b7d4e438d652ca4..ca538e7769c0e210e3abd5595399aaa83a94b812 100644 (file)
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -970,7 +970,6 @@ bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string
   
   }
   else {
-    bool wraponce;
     string lqname = toLower(qname);
     // cerr<<"\nin bind2backend::getBeforeAndAfterAbsolute: nsec3 HASH for "<<auth<<", asked for: "<<lqname<< " (auth: "<<auth<<".)"<<endl;
     typedef recordstorage_t::index<HashedTag>::type records_by_hashindex_t;
@@ -992,7 +991,7 @@ bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string
       iter = hashindex.end();
     }
 
-    wraponce = false;
+    bool wraponce = false;
     while(iter == hashindex.end() || !(iter->auth) || iter->nsec3hash.empty())
     {
       iter--;
@@ -1001,8 +1000,11 @@ bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string
           iter = hashindex.end();
           wraponce = true;
         }
-        else
-          break;
+        else {
+          before.clear();
+          after.clear();
+          return false;
+        }
       }
     }
 
@@ -1017,17 +1019,12 @@ bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string
       iter = hashindex.begin();
     }
 
-    wraponce = false;
     while(!(iter->auth) || iter->nsec3hash.empty())
     {
       iter++;
       if(iter == hashindex.end())
       {
         iter = hashindex.begin();
-        if (!wraponce)
-          wraponce = true;
-        else
-          break;
       }
     }