From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Tue, 4 Jan 2011 12:19:09 +0000 (+0000)
Subject: actually set the module-dir before we need it instead of after - spotted by Stefan... 
X-Git-Tag: auth-3.0~444
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7e0acd8edd95eb5ed5609baf1a69b6b912555af;p=pdns

actually set the module-dir before we need it instead of after - spotted by Stefan Schmidt


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1803 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index ab48297fd..cb882eebc 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -58,7 +58,7 @@ void loadMainConfig(const std::string& configdir)
   cerr<<"configname: '"<<configname<<"'\n";
   
   ::arg().laxFile(configname.c_str());
-
+  ::arg().set("module-dir","Default directory for modules")=LIBDIR;
   BackendMakers().launch(::arg()["launch"]); // vrooooom!
   ::arg().laxFile(configname.c_str());    
   //cerr<<"Backend: "<<::arg()["launch"]<<", '" << ::arg()["gmysql-dbname"] <<"'" <<endl;
@@ -81,8 +81,7 @@ void loadMainConfig(const std::string& configdir)
   ::arg().set("soa-expire-default","Default SOA expire")="604800";
     ::arg().setSwitch("query-logging","Hint backends that queries should be logged")="no";
   ::arg().set("soa-minimum-ttl","Default SOA mininum ttl")="3600";    
-  ::arg().set("module-dir","Default directory for modules")=LIBDIR;
-
+  
   UeberBackend::go();
 }
 
@@ -130,7 +129,6 @@ void orderZone(DNSSECKeeper& dk, const std::string& zone)
 
 void checkZone(DNSSECKeeper& dk, const std::string& zone)
 {
-  loadMainConfig(g_vm["config-dir"].as<string>());
   reportAllTypes();  
   UeberBackend* B = new UeberBackend("default");
   SOAData sd;
@@ -192,7 +190,7 @@ try
     cerr<<desc<<endl;
     return 0;
   }
-
+  
   loadMainConfig(g_vm["config-dir"].as<string>());
   reportAllTypes();
   DNSSECKeeper dk;