From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Fri, 19 Oct 2012 09:04:10 +0000 (+0000)
Subject: if we have only 1 nameserver for a domain, and we have glue for it, use it to resolve... 
X-Git-Tag: auth-3.2-rc1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbbd5988d6d037e2b113c7dc94d5a1a2553d48b2;p=thirdparty%2Fpdns.git

if we have only 1 nameserver for a domain, and we have glue for it, use it to resolve itself. Plus improve debug logging a little bit.


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2817 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 67fb3bd825..f2c1c15280 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -815,7 +815,7 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth,
         }
         return -1;
       }
-      if(qname==*tns && qtype.getCode()==QType::A) {
+      if(pdns_iequals(qname, *tns) && qtype.getCode()==QType::A && rnameservers.size() > 1) {
         LOG<<prefix<<qname<<": Not using NS to resolve itself!"<<endl;
         continue;
       }
@@ -949,7 +949,7 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth,
           t_sstorage->throttle.throttle(d_now.tv_sec,make_tuple(*remoteIP, qname, qtype.getCode()),60,3); // servfail
           continue;
         }
-        LOG<<prefix<<qname<<": Got "<<(unsigned int)lwr.d_result.size()<<" answers from "<<*tns<<" ("<< remoteIP->toString() <<"), rcode="<<lwr.d_rcode<<", in "<<lwr.d_usec/1000<<"ms"<<endl;
+        LOG<<prefix<<qname<<": Got "<<(unsigned int)lwr.d_result.size()<<" answers from "<<*tns<<" ("<< remoteIP->toString() <<"), rcode="<<lwr.d_rcode<<", aa="<<lwr.d_aabit<<", in "<<lwr.d_usec/1000<<"ms"<<endl;
 
         /*  // for you IPv6 fanatics :-)
         if(remoteIP->sin4.sin_family==AF_INET6)