From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 23 Mar 2016 17:29:04 +0000 (+0100)
Subject: Don't replace forwards with broken config file
X-Git-Tag: dnsdist-1.0.0-beta1~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3619%2Fhead;p=thirdparty%2Fpdns.git

Don't replace forwards with broken config file

Closes #2072
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 43c7d8277e..1db3d6b362 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -253,8 +253,8 @@ string reloadAuthAndForwards()
     string configname=::arg()["config-dir"]+"/recursor.conf";
     cleanSlashes(configname);
     
-    if(!::arg().preParseFile(configname.c_str(), "forward-zones")) 
-      L<<Logger::Warning<<"Unable to re-parse configuration file '"<<configname<<"'"<<endl;
+    if(!::arg().preParseFile(configname.c_str(), "forward-zones"))
+      throw runtime_error("Unable to re-parse configuration file '"+configname+"'");
     ::arg().preParseFile(configname.c_str(), "forward-zones-file");
     ::arg().preParseFile(configname.c_str(), "forward-zones-recurse");
     ::arg().preParseFile(configname.c_str(), "auth-zones");
@@ -268,7 +268,8 @@ string reloadAuthAndForwards()
     ::arg().gatherIncludes(extraConfigs);
 
     for(const std::string& fn :  extraConfigs) {
-      ::arg().preParseFile(fn.c_str(), "forward-zones", ::arg()["forward-zones"]);
+      if(!::arg().preParseFile(fn.c_str(), "forward-zones", ::arg()["forward-zones"]))
+        throw runtime_error("Unable to re-parse configuration file include '"+fn+"'");
       ::arg().preParseFile(fn.c_str(), "forward-zones-file", ::arg()["forward-zones-file"]);
       ::arg().preParseFile(fn.c_str(), "forward-zones-recurse", ::arg()["forward-zones-recurse"]);
       ::arg().preParseFile(fn.c_str(), "auth-zones",::arg()["auth-zones"]);