Permalink
Browse files

Support include-dir properly in reload-acl

  • Loading branch information...
1 parent 829849d commit 242b90e167e265823365312c79b97209fdbf6411 @cmouse cmouse committed Feb 7, 2014
Showing with 5 additions and 2 deletions.
  1. +5 −2 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"]);
}
}

0 comments on commit 242b90e

Please sign in to comment.