From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 25 Sep 2014 11:37:57 +0000 (+0200)
Subject: make sure that if we can't reload our configuration file on reload-acls, we don't... 
X-Git-Tag: auth-3.4.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e81852156c0aa1f2b7424e87117a36d41bfe221;p=thirdparty%2Fpdns.git

make sure that if we can't reload our configuration file on reload-acls, we don't revert our acls
to the built-in defaults, but retain the old configuration. Closes #1728. Thanks to Andreas Jakum for spotting this issue.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index c4660fc188..1a9e797fa8 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1674,7 +1674,7 @@ void parseACLs()
     cleanSlashes(configname);
     
     if(!::arg().preParseFile(configname.c_str(), "allow-from-file")) 
-      L<<Logger::Warning<<"Unable to re-parse configuration file '"<<configname<<"'"<<endl;
+      throw runtime_error("Unable to re-parse configuration file '"+configname+"'");
     ::arg().preParseFile(configname.c_str(), "allow-from", LOCAL_NETS);
     ::arg().preParseFile(configname.c_str(), "include-dir");
     ::arg().preParse(g_argc, g_argv, "include-dir");
@@ -1684,8 +1684,10 @@ void parseACLs()
     ::arg().gatherIncludes(extraConfigs);
 
     BOOST_FOREACH(const std::string& fn, extraConfigs) {
-      ::arg().preParseFile(fn.c_str(), "allow-from-file", ::arg()["allow-from-file"]);
-      ::arg().preParseFile(fn.c_str(), "allow-from", ::arg()["allow-from"]);
+      if(!::arg().preParseFile(fn.c_str(), "allow-from-file", ::arg()["allow-from-file"]))
+	throw runtime_error("Unable to re-parse configuration file include '"+fn+"'");
+      if(!::arg().preParseFile(fn.c_str(), "allow-from", ::arg()["allow-from"]))
+	throw runtime_error("Unable to re-parse configuration file include '"+fn+"'");
     }
 
     ::arg().preParse(g_argc, g_argv, "allow-from-file");