Merge pull request #4485 from mind04/cache-soa

soa and caching
PowerDNS · Sep 29, 2016 · 1f33077 · 1f33077
2 parents fcc34b2 + 484efba
commit 1f33077
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
@@ -281,18 +281,20 @@ bool DNSBackend::get(DNSZoneRecord& dzr)
       vector<string> parts;
       stringtok(parts, rr.content, " \t");
       if(parts.size() < 1)
-        rr.content+=arg()["default-soa-name"];
+        rr.content = arg()["default-soa-name"];
       if(parts.size() < 2)
-        rr.content+=" "+arg()["default-soa-mail"];      
+        rr.content += " " +arg()["default-soa-mail"];
       if(parts.size() < 3)
         rr.content += " 0";
       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 {

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
@@ -396,7 +396,8 @@ bool UeberBackend::getSOAUncached(const DNSName &domain, SOAData &sd, DNSPacket
       return true;
     }
 
-  addNegCache(d_question);
+  if(d_negcache_ttl)
+    addNegCache(d_question);
   return false;
 }