Changeset 819 for trunk/pdns/pdns/syncres.cc

Timestamp:

05/05/06 09:33:37 (7 years ago)

Author:

ahu

Message:

implement RFC 2181 paragraph 5.2:

Should an authoritative source send such a malformed RRSet, the
client should treat the RRs for all purposes as if all TTLs in the
RRSet had been set to the value of the lowest TTL in the RRSet.

Thanks to Stephen Harker for noticing in  http://mailman.powerdns.com/pipermail/pdns-users/2006-May/003341.html

Files:

• trunk/pdns/pdns/syncres.cc (modified) (2 diffs)

trunk/pdns/pdns/syncres.cc

@@ -700 +700 @@
             DNSResourceRecord rr=*i;
             rr.d_place=DNSResourceRecord::ANSWER;
-            //      if(rr.ttl < 5)
+            //      if(rr.ttl < 5)
             //  rr.ttl=60;
-            rr.ttl+=d_now.tv_sec;
+
+            rr.ttl += d_now.tv_sec;
             if(rr.qtype.getCode() == QType::NS) // people fiddle with the case
               rr.content=toLower(rr.content); // this must stay!
@@ -714 +715 @@
       // supplant
       for(tcache_t::const_iterator i=tcache.begin();i!=tcache.end();++i) {
+        if(i->second.size() > 1) {
+          uint32_t lowestTTL=numeric_limits<uint32_t>::max();
+          for(tcache_t::value_type::second_type::iterator j=i->second.begin(); j != i->second.end(); ++j)
+            lowestTTL=min(lowestTTL, j->ttl);
+          
+          for(tcache_t::value_type::second_type::iterator j=i->second.begin(); j != i->second.end(); ++j)
+            ((tcache_t::value_type::second_type::value_type*)&(*j))->ttl=lowestTTL;
+        }
+
         RC.replace(i->first.first, i->first.second, i->second);
       }