From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Wed, 16 Mar 2011 19:11:15 +0000 (+0000)
Subject: add error checking for the Lua incoming AXFR filter script. jp_mens, pls update your... 
X-Git-Tag: auth-3.0~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2aefbf9171a479480d39fce0db8699b7f65b13b;p=pdns

add error checking for the Lua incoming AXFR filter script. jp_mens, pls update your blog ;-)


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2067 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index fe85e1b95..53ac6615f 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -114,8 +114,14 @@ void CommunicatorClass::suck(const string &domain,const string &remote)
     scoped_ptr<PowerDNSLua> pdl;
     vector<string> scripts;
     if(B->getDomainMetadata(domain, "LUA-AXFR-SCRIPT", scripts) && !scripts.empty()) {
-      pdl.reset(new PowerDNSLua(scripts[0]));
-      L<<Logger::Info<<"Loaded Lua script '"<<scripts[0]<<"' to edit the incoming AXFR of '"<<domain<<"'"<<endl;
+      try {
+        pdl.reset(new PowerDNSLua(scripts[0]));
+        L<<Logger::Info<<"Loaded Lua script '"<<scripts[0]<<"' to edit the incoming AXFR of '"<<domain<<"'"<<endl;
+      }
+      catch(std::exception& e) {
+        L<<Logger::Error<<"Failed to load Lua editing script '"<<scripts[0]<<"' for incoming AXFR of '"<<domain<<"': "<<e.what()<<endl;
+        return;
+      }
     }
     AXFRRetriever retriever(raddr, domain.c_str(), tsigkeyname, tsigalgorithm, tsigsecret);