Changeset 2323

Timestamp:

12/23/11 10:50:40 (17 months ago)

Author:

peter

Message:

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

Files:

• trunk/pdns/pdns/rec_channel_rec.cc (modified) (1 diff)

trunk/pdns/pdns/rec_channel_rec.cc

@@ -590 +590 @@
     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";
   }