From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 7 Feb 2014 11:27:30 +0000 (+0200)
Subject: Reordered reload-zones to act consistently with startup
X-Git-Tag: rec-3.6.0-rc1~190^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1262%2Fhead;p=thirdparty%2Fpdns.git

Reordered reload-zones to act consistently with startup
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 832a47fbd8..2b28eea330 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -254,15 +254,10 @@ string reloadAuthAndForwards()
     
     if(!::arg().preParseFile(configname.c_str(), "forward-zones")) 
       L<<Logger::Warning<<"Unable to re-parse configuration file '"<<configname<<"'"<<endl;
-    ::arg().preParse(g_argc, g_argv, "forward-zones");
     ::arg().preParseFile(configname.c_str(), "forward-zones-file");
-    ::arg().preParse(g_argc, g_argv, "forward-zones-file");
     ::arg().preParseFile(configname.c_str(), "auth-zones");
-    ::arg().preParse(g_argc, g_argv, "auth-zones");
     ::arg().preParseFile(configname.c_str(), "export-etc-hosts", "off");
-    ::arg().preParse(g_argc, g_argv, "export-etc-hosts");
     ::arg().preParseFile(configname.c_str(), "serve-rfc1918");
-    ::arg().preParse(g_argc, g_argv, "serve-rfc1918");
     ::arg().preParseFile(configname.c_str(), "include-dir");
     ::arg().preParse(g_argc, g_argv, "include-dir");
 
@@ -278,6 +273,12 @@ string reloadAuthAndForwards()
       ::arg().preParseFile(fn.c_str(), "serve-rfc1918",::arg()["serve-rfc1918"]);
     }
 
+    ::arg().preParse(g_argc, g_argv, "forward-zones");
+    ::arg().preParse(g_argc, g_argv, "forward-zones-file");
+    ::arg().preParse(g_argc, g_argv, "auth-zones");
+    ::arg().preParse(g_argc, g_argv, "export-etc-hosts");
+    ::arg().preParse(g_argc, g_argv, "serve-rfc1918");
+
     SyncRes::domainmap_t* newDomainMap = parseAuthAndForwards();
     
     // purge again - new zones need to blank out the cache