rebase to HEAD

diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index 9b72bb28ac6ee3e206cc590ed09794149a2bd8b6..6818c3f2d03428181d0a928f7641fa8e6aa9536f 100644 (file)
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -274,7 +274,7 @@ template<class Answer, class Question, class Backend>int SingleThreadDistributor
   try {
     a=b->question(q); // a can be NULL!
   }
-  catch(const AhuException &e) {
+  catch(const PDNSException &e) {
     L<<Logger::Error<<"Backend error: "<<e.reason<<endl;
     delete b;
     b=new Backend;