From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 1 May 2018 17:16:52 +0000 (+0200)
Subject: make rec_control respect include-dir; closes #6536
X-Git-Tag: dnsdist-1.3.1~123^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6557%2Fhead;p=thirdparty%2Fpdns.git

make rec_control respect include-dir; closes #6536
---

diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index f9658d468e..90f6fd1c21 100644
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -66,10 +66,7 @@ static void initArguments(int argc, char** argv)
   
   cleanSlashes(configname);
 
-  if(!::arg().preParseFile(configname.c_str(), "socket-dir", ""))
-    cerr<<"Warning: unable to parse configuration file '"<<configname<<"'"<<endl;
-  if(!::arg().preParseFile(configname.c_str(), "chroot", ""))
-    cerr<<"Warning: unable to parse configuration file '"<<configname<<"'"<<endl;
+  arg().laxFile(configname.c_str());
 
   arg().laxParse(argc,argv);   // make sure the commandline wins