From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 6 Feb 2014 13:50:35 +0000 (+0100)
Subject: avoid merging old and new additional data, fixes an issue caused by weird Akamai... 
X-Git-Tag: rec-3.6.0-rc1~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6196f908e97cd8334e7e9f857689b341d8a59641;p=thirdparty%2Fpdns.git

avoid merging old and new additional data, fixes an issue caused by weird Akamai behaviour
---

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index c7ac0a0de3..14df3a56f3 100644
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -242,6 +242,12 @@ void MemRecursorCache::replace(time_t now, const string &qname, const QType& qt,
   else
     ; //cerr<<"\tNot nuking"<<endl;
 
+  // make sure we don't accidentally merge old and new unauth data
+  if(!auth && !ce.d_auth) {
+    ce.d_records.clear();
+    isNew=true;
+  }
+
   // cerr<<"\tHave "<<content.size()<<" records to store\n";
   for(set<DNSResourceRecord>::const_iterator i=content.begin(); i != content.end(); ++i) {
     // cerr<<"To store: "<<i->content<<" with ttl/ttd "<<i->ttl<<endl;