]> granicus.if.org Git - pdns/commitdiff
actually set the module-dir before we need it instead of after - spotted by Stefan...
authorBert Hubert <bert.hubert@netherlabs.nl>
Tue, 4 Jan 2011 12:19:09 +0000 (12:19 +0000)
committerBert Hubert <bert.hubert@netherlabs.nl>
Tue, 4 Jan 2011 12:19:09 +0000 (12:19 +0000)
git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1803 d19b8d6e-7fed-0310-83ef-9ca221ded41b

pdns/pdnssec.cc

index ab48297fd4c32871a4f8886deaabf27275ddc133..cb882eebca2c24b26ea88f0219968cc13b8d82e7 100644 (file)
@@ -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;