From 3e63da83fde2d98ed0739578f7171aa4e70a6f32 Mon Sep 17 00:00:00 2001 From: Jake Reynolds Date: Wed, 15 Nov 2017 14:59:43 +0000 Subject: [PATCH] Edit configname to include the 'config-name' argument --- pdns/pdns_recursor.cc | 3 +++ pdns/reczones.cc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 63388c24e..fed8b01a3 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 c35cdfda5..b0ac82748 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")) -- 2.40.0