Changeset 1774

Timestamp:

12/30/10 22:20:06 (2 years ago)

Author:

ahu

Message:

stop bind backend from crashing on domains that are not found, plus fix up canonical ordering issues

Files:

• trunk/pdns/pdns/backends/bind/bindbackend2.cc (modified) (4 diffs)

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -793 +793 @@
 bool Bind2Backend::findBeforeAndAfterUnhashed(BB2DomainInfo& bbd, const std::string& qname, std::string& unhashed, std::string& before, std::string& after)
 {
-
   string domain=toLower(qname);
-  string lname = labelReverse(domain);
-
-  cout<<"starting lower bound for: '"<<domain<<"', search is for: '"<<lname<<"'"<<endl;
-
-  recordstorage_t::const_iterator iter = lower_bound(bbd.d_records->begin(), bbd.d_records->end(), lname);
+
+  cout<<"starting lower bound for: '"<<domain<<"'"<<endl;
+
+  recordstorage_t::const_iterator iter = lower_bound(bbd.d_records->begin(), bbd.d_records->end(), domain);
 
   while(iter != bbd.d_records->begin() && !boost::prior(iter)->auth && boost::prior(iter)->qtype!=QType::NS) {
@@ -820 +818 @@
 
   cerr<<"Now upper bound"<<endl;
-  iter = upper_bound(bbd.d_records->begin(), bbd.d_records->end(), lname);
+  iter = upper_bound(bbd.d_records->begin(), bbd.d_records->end(), domain);
 
   while(iter!=bbd.d_records->end() && (!iter->auth && iter->qtype != QType::NS))
@@ -826 +824 @@
 
   if(iter == bbd.d_records->end()) {
-    cerr<<"\tFound the end!"<<endl;
-    after = dotConcat(labelReverse(bbd.d_records->begin()->qname), bbd.d_name);
+    cerr<<"\tFound the end, begin storage: '"<<bbd.d_records->begin()->qname<<"', '"<<bbd.d_name<<"'"<<endl;
+    after.clear(); // this does the right thing
   } else {
     cerr<<"\tFound: '"<<iter->qname<<"'"<<endl;
@@ -979 +977 @@
     // cerr<<"Found nothign!"<<endl;
     d_handle.d_list=false;
+    d_handle.d_iter = d_handle.d_end_iter  = range.first;
     return;
   }