From: Mark Zealey <mark@markandruth.co.uk>
Date: Fri, 3 Jan 2014 08:43:50 +0000 (+0200)
Subject: Merge branch 'master' into fix-reload
X-Git-Tag: rec-3.6.0-rc1~269^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7744e0ee26751a262b00f8489b0ab5bda7cb94c6;p=pdns

Merge branch 'master' into fix-reload
---

7744e0ee26751a262b00f8489b0ab5bda7cb94c6
diff --cc pdns/ueberbackend.cc
index ebb30a637,01671204f..2c390a8f8
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@@ -321,18 -277,19 +321,20 @@@ bool UeberBackend::getSOA(const string 
      }
    }
      
 +  check_op_requests();
    for(vector<DNSBackend *>::const_iterator i=backends.begin();i!=backends.end();++i)
      if((*i)->getSOA(domain, sd, p)) {
-       DNSResourceRecord rr;
-       rr.qname=domain;
-       rr.qtype=QType::SOA;
-       rr.content=serializeSOAData(sd);
-       rr.ttl=sd.ttl;
-       rr.domain_id=sd.domain_id;
-       vector<DNSResourceRecord> rrs;
-       rrs.push_back(rr);
-       addCache(d_question, rrs);
+       if( d_cache_ttl ) {
+         DNSResourceRecord rr;
+         rr.qname=domain;
+         rr.qtype=QType::SOA;
+         rr.content=serializeSOAData(sd);
+         rr.ttl=sd.ttl;
+         rr.domain_id=sd.domain_id;
+         vector<DNSResourceRecord> rrs;
+         rrs.push_back(rr);
+         addCache(d_question, rrs);
+       }
        return true;
      }