From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 18 Sep 2013 00:48:45 +0000 (+0200)
Subject: fix getDomainInfo(), d_result is gone after getSOA
X-Git-Tag: rec-3.6.0-rc1~437^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1026%2Fhead;p=thirdparty%2Fpdns.git

fix getDomainInfo(), d_result is gone after getSOA
---

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index 737a0a858c..97e85cab15 100644
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -128,6 +128,7 @@ bool GSQLBackend::getDomainInfo(const string &domain, DomainInfo &di)
   stringtok(di.masters, d_result[0][2], " ,\t");
   di.last_check=atol(d_result[0][3].c_str());
   di.notified_serial = atol(d_result[0][4].c_str());
+  string type=d_result[0][5];
   di.backend=this;
 
   di.serial = 0;
@@ -142,7 +143,6 @@ bool GSQLBackend::getDomainInfo(const string &domain, DomainInfo &di)
     L<<Logger::Error<<"Error retrieving serial for '"<<domain<<"': "<<ae.reason<<endl;
   }
 
-  string type=d_result[0][5];
   if(pdns_iequals(type,"SLAVE"))
     di.kind=DomainInfo::Slave;
   else if(pdns_iequals(type,"MASTER"))
diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 8abcb8e3e3..1bc124d4a6 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -154,6 +154,7 @@ void loadMainConfig(const std::string& configdir)
   ::arg().set("negquery-cache-ttl","Seconds to store negative query results in the QueryCache")="60";
   ::arg().set("query-cache-ttl","Seconds to store query results in the QueryCache")="20";              
   ::arg().set("default-soa-name","name to insert in the SOA record if none set in the backend")="a.misconfigured.powerdns.server";
+  ::arg().set("default-soa-mail","mail address to insert in the SOA record if none set in the backend")="";
   ::arg().set("soa-refresh-default","Default SOA refresh")="10800";
   ::arg().set("soa-retry-default","Default SOA retry")="3600";
   ::arg().set("soa-expire-default","Default SOA expire")="604800";