Use include files when processing acls

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 57b1539faaf081d7a33111a9e49bc507841ec292..0200140b1bdd96e387cb5d9a382ca347dadc3e96 100644 (file)
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -473,7 +473,6 @@ bool ArgvMap::file(const char *fname, bool lax, bool included)
         throw ArgException(fn + " could not be parsed");
       }
     }
-    closedir(dir);
   }
 
   return true;
@@ -518,4 +517,5 @@ void ArgvMap::gatherIncludes(std::vector<std::string> &extraConfigs) {
       }
     }
     std::sort(extraConfigs.begin(), extraConfigs.end(), CIStringComparePOSIX()); 
+    closedir(dir);
 }

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 9cde5380c4dd08adff1a77618cb85f0e99c52cf6..e80ffab5f61fb949b0dbba042de61ab1c41af72c 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1632,6 +1632,14 @@ 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().preParse(g_argc, g_argv, "include-dir");
+
+    // then process includes
+    std::vector<std::string> extraConfigs;
+    BOOST_FOREACH(const std::string& fn, extraConfigs) {
+      ::arg().preParseFile(fn.c_str(), "allow-from-file");
+      ::arg().preParseFile(fn.c_str(), "allow-from");
+    }
   }
 
   NetmaskGroup* oldAllowFrom = t_allowFrom, *allowFrom=new NetmaskGroup;