Changeset 919

Show
Ignore:
Timestamp:
11/10/06 18:04:38 (2 years ago)
Author:
ahu
Message:

many thanks to David GAVARRET

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/pdns/pdns/syncres.cc

    r901 r919  
    1717*/ 
    1818 
     19#include <boost/algorithm/string.hpp> 
    1920#include "utility.hh" 
    2021#include "syncres.hh" 
    …… 
    856857      } 
    857858      if(!newtarget.empty()) { 
     859        if(iequals(newtarget,qname)) { 
     860          LOG<<prefix<<qname<<": status=got a CNAME referral to self, returning SERVFAIL"<<endl; 
     861          return RCode::ServFail; 
     862        } 
     863        if(depth > 10) { 
     864          LOG<<prefix<<qname<<": status=got a CNAME referral, but recursing too deep, returning SERVFAIL"<<endl; 
     865          return RCode::ServFail; 
     866        } 
    858867        LOG<<prefix<<qname<<": status=got a CNAME referral, starting over with "<<newtarget<<endl; 
     868 
    859869        set<GetBestNSAnswer>beenthere2; 
    860         return doResolve(newtarget, qtype, ret,0,beenthere2); 
     870        return doResolve(newtarget, qtype, ret, depth + 1, beenthere2); 
    861871      } 
    862872      if(nsset.empty() && !d_lwr.d_rcode) {