From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 7 Feb 2014 11:26:14 +0000 (+0200)
Subject: Reorder reload-acl to act consistently with startup
X-Git-Tag: rec-3.6.0-rc1~190^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca2c884cb14ddb21797fdecbb43f9c567dcab4ca;p=pdns

Reorder reload-acl to act consistently with startup
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 0e3158a61..c89a5174a 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1629,9 +1629,7 @@ void parseACLs()
     
     if(!::arg().preParseFile(configname.c_str(), "allow-from-file")) 
       L<<Logger::Warning<<"Unable to re-parse configuration file '"<<configname<<"'"<<endl;
-    ::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");
 
@@ -1643,6 +1641,9 @@ void parseACLs()
       ::arg().preParseFile(fn.c_str(), "allow-from-file", ::arg()["allow-from-file"]);
       ::arg().preParseFile(fn.c_str(), "allow-from", ::arg()["allow-from"]);
     }
+
+    ::arg().preParse(g_argc, g_argv, "allow-from-file");
+    ::arg().preParse(g_argc, g_argv, "allow-from");
   }
 
   NetmaskGroup* oldAllowFrom = t_allowFrom, *allowFrom=new NetmaskGroup;
@@ -2128,7 +2129,6 @@ int main(int argc, char **argv)
       exit(0);
     }
 
-
     string configname=::arg()["config-dir"]+"/"+s_programname+".conf";
     cleanSlashes(configname);