From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sun, 2 Jan 2011 18:28:55 +0000 (+0000)
Subject: pare down zone2sql/zone2ldap dependencies so they don't depend on a working database... 
X-Git-Tag: auth-3.0~460
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9cedd9683cf8012eb89647e06ea42cc68f85014;p=pdns

pare down zone2sql/zone2ldap dependencies so they don't depend on a working database connection
remove key-repository setting from bind backend


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

diff --git a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am
index 5881c91bd..262ae9694 100644
--- a/pdns/backends/bind/Makefile.am
+++ b/pdns/backends/bind/Makefile.am
@@ -16,16 +16,16 @@ EXTRA_DIST=bindparser.cc bindparser.h
 
 zone2sql_SOURCES=bindparser.yy bindlexer.l \
 ../../arguments.cc ../../logger.cc zone2sql.cc ../../statbag.cc ../../misc.cc \
-../../unix_utility.cc ../../qtype.cc ../../dnspacket.cc \
+../../unix_utility.cc ../../qtype.cc ../../dns.cc \
 ../../zoneparser-tng.cc ../../dnsrecords.cc ../../sillyrecords.cc \
 ../../dnswriter.cc ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc \
-../../nsecrecords.cc ../../dnssecinfra.cc ../../fsdnsseckeeper.cc ../../base32.cc
+../../nsecrecords.cc ../../dnssecinfra.cc  ../../base32.cc # ../../dbdnsseckeeper.cc
 
 zone2ldap_SOURCES=bindparser.yy bindlexer.l \
 ../../arguments.cc ../../logger.cc zone2ldap.cc ../../statbag.cc ../../misc.cc \
 ../../unix_utility.cc ../../qtype.cc  ../../zoneparser-tng.cc ../../dnsrecords.cc \
 ../../dnswriter.cc ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc ../../sillyrecords.cc \
-../../nsecrecords.cc ../../dnssecinfra.cc ../../fsdnsseckeeper.cc ../../base32.cc
+../../nsecrecords.cc ../../dnssecinfra.cc  ../../base32.cc # ../../dbdnsseckeeper.cc
 
 zone2ldap_LDFLAGS=@THREADFLAGS@ $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) -L../../ext/polarssl/library
 zone2ldap_LDADD=$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -lpolarssl
diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 3dd3f5381..bc07700b9 100644
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -601,7 +601,7 @@ void Bind2Backend::loadConfig(string* status)
         
         if(filenameChanged || !bbd->d_loaded || !bbd->current()) {
           L<<Logger::Info<<d_logprefix<<" parsing '"<<i->name<<"' from file '"<<i->filename<<"'"<<endl;
-          DNSSECKeeper dk(::arg()["key-repository"]);
+          DNSSECKeeper dk;
           NSEC3PARAMRecordContent ns3pr;
           dk.getNSEC3PARAM(i->name, &ns3pr);
           if(ns3pr.d_salt.empty())
@@ -838,7 +838,7 @@ bool Bind2Backend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string
 {
   shared_ptr<State> state = s_state;
   BB2DomainInfo& bbd = state->id_zone_map[id];  
-  DNSSECKeeper dk(::arg()["key-repository"]);
+  DNSSECKeeper dk;
   NSEC3PARAMRecordContent ns3pr;
   string auth=state->id_zone_map[id].d_name;