Changeset 1628 for trunk/pdns/pdns/syncres.cc

Timestamp:

06/09/10 23:26:50 (3 years ago)

Author:

ahu

Message:

fix up SOA misunderstanding around CNAME referrals from UltraDNS. Thanks to 'marwood' for reporting this.

Files:

• trunk/pdns/pdns/syncres.cc (modified) (1 diff)

trunk/pdns/pdns/syncres.cc

@@ -1051 +1051 @@
            lwr.d_rcode==RCode::NoError) {
           LOG<<prefix<<qname<<": got negative caching indication for '"<< (qname+"|"+i->qtype.getName()+"'") <<endl;
-          if(!newtarget.empty())
+          
+          if(!newtarget.empty()) {
+            LOG<<prefix<<qname<<": Hang on! Got a redirect to '"<<newtarget<<"' already"<<endl;
+          }
+          else {
             ret.push_back(*i);
-          
-          NegCacheEntry ne;
-          ne.d_qname=i->qname;
-          ne.d_ttd=d_now.tv_sec + min(s_maxnegttl, i->ttl);
-          ne.d_name=qname;
-          ne.d_qtype=qtype;
-          if(qtype.getCode()) {  // prevents us from blacking out a whole domain
-            replacing_insert(t_sstorage->negcache, ne);
-          }
-          negindic=true;
+            NegCacheEntry ne;
+            ne.d_qname=i->qname;
+            ne.d_ttd=d_now.tv_sec + min(s_maxnegttl, i->ttl);
+            ne.d_name=qname;
+            ne.d_qtype=qtype;
+            if(qtype.getCode()) {  // prevents us from blacking out a whole domain
+              replacing_insert(t_sstorage->negcache, ne);
+            }
+            negindic=true;
+          }
         }
       }