From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 6 Jan 2015 14:28:25 +0000 (+0100)
Subject: if a query ends up failing so badly we want to reprime the root, do so, but abort... 
X-Git-Tag: rec-3.7.0-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6576051d03a5f25c0cf8f4848d0ae2eb665aedfa;p=thirdparty%2Fpdns.git

if a query ends up failing so badly we want to reprime the root, do so, but abort the query
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index d10e049224..e174fbb47f 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -570,14 +570,17 @@ void SyncRes::getBestNSFromCache(const string &qname, set<DNSResourceRecord>&bes
           bestns.clear();
         }
         else {
-          beenthere.insert(answer);
+	  beenthere.insert(answer);
           LOG(prefix<<qname<<": We have NS in cache for '"<<subdomain<<"' (flawedNSSet="<<*flawedNSSet<<")"<<endl);
           return;
         }
       }
     }
     LOG(prefix<<qname<<": no valid/useful NS in cache for '"<<subdomain<<"'"<<endl);
-    if(subdomain==".") { primeHints(); }
+    if(subdomain==".") { 
+      primeHints(); 
+      throw ImmediateServFailException("query ended up doubting the root, reprimed");
+    }
   }while(chopOffDotted(subdomain));
 }