From a97395cd25f0e70b70135a6a0f8234162cee3377 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 23 Dec 2011 09:50:40 +0000
Subject: [PATCH] Don't crash when reload-acls encounters garbage. Fixes #330

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2323 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/rec_channel_rec.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 82a330423e65..ba46f3b85bbe 100644
--- 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";
   }