From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 15 Feb 2016 20:05:06 +0000 (+0100)
Subject: pdnsutil: respect default-soa-* settings
X-Git-Tag: auth-4.0.0-alpha2~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3385%2Fhead;p=thirdparty%2Fpdns.git

pdnsutil: respect default-soa-* settings

Closes #3382
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 6234916fba..9e59fd4ec3 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -97,8 +97,6 @@ void loadMainConfig(const std::string& configdir)
   BackendMakers().launch(::arg()["launch"]); // vrooooom!
   L.toConsole((Logger::Urgency)(::arg().asNum("loglevel")));  
 
-  if (! ::arg().laxFile(configname.c_str()))
-    cerr<<"Warning: unable to read configuration file '"<<configname<<"'."<<endl;
   //cerr<<"Backend: "<<::arg()["launch"]<<", '" << ::arg()["gmysql-dbname"] <<"'" <<endl;
 
   S.declare("qsize-q","Number of questions waiting for database attention");
@@ -121,6 +119,10 @@ void loadMainConfig(const std::string& configdir)
   ::arg().set("soa-expire-default","Default SOA expire")="604800";
   ::arg().set("soa-minimum-ttl","Default SOA minimum ttl")="3600";    
 
+  // Keep this line below all ::arg().set() statements
+  if (! ::arg().laxFile(configname.c_str()))
+    cerr<<"Warning: unable to read configuration file '"<<configname<<"'."<<endl;
+
   UeberBackend::go();
 }