From: Bert Hubert <bert.hubert@netherlabs.nl> Date: Thu, 10 Jan 2013 15:45:22 +0000 (+0000) Subject: make sure we don't disregard the commandline when doing reload-acls for recursor... X-Git-Tag: auth-3.2~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbd23fc204ae50fcc01404413a7da94e98c1d6a3;p=pdns make sure we don't disregard the commandline when doing reload-acls for recursor, closing ticket 490. git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3037 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 2e465c831..e315e5260 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -1541,6 +1541,9 @@ void* pleaseSupplantACLs(NetmaskGroup *ng) return 0; } +int g_argc; +char** g_argv; + void parseACLs() { static bool l_initialized; @@ -1551,8 +1554,9 @@ 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"); } NetmaskGroup* oldAllowFrom = t_allowFrom, *allowFrom=new NetmaskGroup; @@ -1937,6 +1941,8 @@ void doWindowsServiceArguments(RecursorService& recursor) int main(int argc, char **argv) { + g_argc = argc; + g_argv = argv; g_stats.startupTime=time(0); reportBasicTypes();