Edit configname to include the 'config-name' argument

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 63388c24e40f0a2bedb74b1f9c1f9b454d5ca52b..fed8b01a33841ea56951af4c6db2836947db8025 100644 (file)
--- 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 c35cdfda5a456913ba3ea430de230df6348ecbe2..b0ac82748f09bc955afce0e1fe1cba32c544fe1a 100644 (file)
--- 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"))