From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Fri, 7 Feb 2014 12:59:20 +0000 (+0100)
Subject: Recursor: fix reloading forward-zones-recurse
X-Git-Tag: rec-3.6.0-rc1~189^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b6d1ba487cdeeb17b6252fe36f61fad8c40985d;p=pdns

Recursor: fix reloading forward-zones-recurse

f-z-r was previously not affected by reload-zones, but really should
be.
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 2b28eea33..40e41ad45 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -255,6 +255,7 @@ string reloadAuthAndForwards()
     if(!::arg().preParseFile(configname.c_str(), "forward-zones")) 
       L<<Logger::Warning<<"Unable to re-parse configuration file '"<<configname<<"'"<<endl;
     ::arg().preParseFile(configname.c_str(), "forward-zones-file");
+    ::arg().preParseFile(configname.c_str(), "forward-zones-recurse");
     ::arg().preParseFile(configname.c_str(), "auth-zones");
     ::arg().preParseFile(configname.c_str(), "export-etc-hosts", "off");
     ::arg().preParseFile(configname.c_str(), "serve-rfc1918");
@@ -268,6 +269,7 @@ string reloadAuthAndForwards()
     BOOST_FOREACH(const std::string& fn, extraConfigs) {
       ::arg().preParseFile(fn.c_str(), "forward-zones", ::arg()["forward-zones"]);
       ::arg().preParseFile(fn.c_str(), "forward-zones-file", ::arg()["forward-zones-file"]);
+      ::arg().preParseFile(fn.c_str(), "forward-zones-recurse", ::arg()["forward-zones-recurse"]);
       ::arg().preParseFile(fn.c_str(), "auth-zones",::arg()["auth-zones"]);
       ::arg().preParseFile(fn.c_str(), "export-etc-hosts",::arg()["export-etc-hosts"]);
       ::arg().preParseFile(fn.c_str(), "serve-rfc1918",::arg()["serve-rfc1918"]);
@@ -275,6 +277,7 @@ string reloadAuthAndForwards()
 
     ::arg().preParse(g_argc, g_argv, "forward-zones");
     ::arg().preParse(g_argc, g_argv, "forward-zones-file");
+    ::arg().preParse(g_argc, g_argv, "forward-zones-recurse");
     ::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");