Don't crash when reload-acls encounters garbage. Fixes PowerDNS#330

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2323 d19b8d6e-7fed-0310-83ef-9ca221ded41b
evharten · Dec 23, 2011 · a97395c · a97395c
1 parent d2322a5
commit a97395c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
@@ -589,8 +589,14 @@ string RecursorControlParser::getAnswer(const string& question, RecursorControlP
     } 
     catch(std::exception& e) 
     {
+      L<<Logger::Error<<"reloading ACLs failed (Exception: "<<e.what()<<")"<<endl;
       return e.what() + string("\n");
     }
+    catch(AhuException& ae)
+    {
+      L<<Logger::Error<<"reloading ACLs failed (AhuException: "<<ae.reason<<")"<<endl;
+      return ae.reason + string("\n");
+    }
     return "ok\n";
   }