From: Jake Reynolds <jakealexis@gmail.com>
Date: Wed, 15 Nov 2017 14:59:43 +0000 (+0000)
Subject: Edit configname to include the 'config-name' argument
X-Git-Tag: rec-4.1.0-rc3~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5961%2Fhead;p=thirdparty%2Fpdns.git

Edit configname to include the 'config-name' argument
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 63388c24e4..fed8b01a33 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2669,6 +2669,9 @@ void parseACLs()
 
   if(l_initialized) { // only reload configuration file on second call
     string configname=::arg()["config-dir"]+"/recursor.conf";
+    if(::arg()["config-name"]!="") {
+      configname=::arg()["config-dir"]+"/recursor-"+::arg()["config-name"]+".conf";
+    }
     cleanSlashes(configname);
 
     if(!::arg().preParseFile(configname.c_str(), "allow-from-file"))
diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index c35cdfda5a..b0ac82748f 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -257,6 +257,9 @@ string reloadAuthAndForwards()
     }
 
     string configname=::arg()["config-dir"]+"/recursor.conf";
+    if(::arg()["config-name"]!="") {
+      configname=::arg()["config-dir"]+"/recursor-"+::arg()["config-name"]+".conf";
+    }
     cleanSlashes(configname);
     
     if(!::arg().preParseFile(configname.c_str(), "forward-zones"))