From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 13 May 2013 13:22:09 +0000 (+0200)
Subject: make depth limiter somewhat more sophisticated
X-Git-Tag: auth-3.3-rc1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40de29103cc1d47d56b5f00162ccb7c180d2a825;p=thirdparty%2Fpdns.git

make depth limiter somewhat more sophisticated
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 6e61982b38..7c2ed96cd6 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -606,7 +606,7 @@ bool SyncRes::doCNAMECacheCheck(const string &qname, const QType &qtype, vector<
     prefix.append(depth, ' ');
   }
 
-  if(depth>9) {
+  if((depth>9 && d_outqueries>10 && d_throttledqueries>5) || depth > 15) {
     LOG(prefix<<qname<<": recursing (CNAME or other indirection) too deep, depth="<<depth<<endl);
     res=RCode::ServFail;
     return true;