From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 7 Feb 2014 10:55:16 +0000 (+0200)
Subject: Support include-dir properly in reload-acl
X-Git-Tag: rec-3.6.0-rc1~190^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=242b90e167e265823365312c79b97209fdbf6411;p=thirdparty%2Fpdns.git

Support include-dir properly in reload-acl
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index e80ffab5f6..0e3158a616 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1632,13 +1632,16 @@ void parseACLs()
     ::arg().preParse(g_argc, g_argv, "allow-from-file");
     ::arg().preParseFile(configname.c_str(), "allow-from", LOCAL_NETS);
     ::arg().preParse(g_argc, g_argv, "allow-from");
+    ::arg().preParseFile(configname.c_str(), "include-dir");
     ::arg().preParse(g_argc, g_argv, "include-dir");
 
     // then process includes
     std::vector<std::string> extraConfigs;
+    ::arg().gatherIncludes(extraConfigs);
+
     BOOST_FOREACH(const std::string& fn, extraConfigs) {
-      ::arg().preParseFile(fn.c_str(), "allow-from-file");
-      ::arg().preParseFile(fn.c_str(), "allow-from");
+      ::arg().preParseFile(fn.c_str(), "allow-from-file", ::arg()["allow-from-file"]);
+      ::arg().preParseFile(fn.c_str(), "allow-from", ::arg()["allow-from"]);
     }
   }