From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 29 Sep 2016 18:05:31 +0000 (+0200)
Subject: Merge pull request #4485 from mind04/cache-soa
X-Git-Tag: dnsdist-1.1.0-beta2~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f3307709ca5369a54b0f2ff5a27f042bf7aca86;p=thirdparty%2Fpdns.git

Merge pull request #4485 from mind04/cache-soa

soa and caching
---

1f3307709ca5369a54b0f2ff5a27f042bf7aca86
diff --cc pdns/dnsbackend.cc
index 7bd05aa430,7a861a1d82..c987f095ac
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@@ -289,21 -289,16 +289,23 @@@ bool DNSBackend::get(DNSZoneRecord& dzr
        if(parts.size() < 4)
          rr.content += " " + ::arg()["soa-refresh-default"];
        if(parts.size() < 5)
-         rr.content += " " + ::arg()["soa-expire-default"];
+         rr.content += " " + ::arg()["soa-retry-default"];
        if(parts.size() < 6)
-         rr.content += " " + ::arg()["soa-minimum-default"];
-       dzr.dr = DNSRecord(rr);        
+         rr.content += " " + ::arg()["soa-expire-default"];
+       if(parts.size() < 7)
+         rr.content += " " + ::arg()["soa-minimum-ttl"];
+       dzr.dr = DNSRecord(rr);
      }
    }
 -  else 
 -    dzr.dr = DNSRecord(rr);
 +  else {
 +    try {
 +      dzr.dr = DNSRecord(rr);
 +    }
 +    catch(...) {
 +      while(this->get(rr));
 +      throw;
 +    }
 +  }
    return true;
  }