Changeset 1475

Timestamp:

12/27/09 15:22:45 (3 months ago)

Author:

ahu

Message:

prevent duplicate SOA from appearing in case a response contains a CNAME and a SOA
zero the 'priority' field just to be sure in lwres.cc response handling

Location:

trunk/pdns/pdns

Files:

• lwres.cc (modified) (2 diffs)
• syncres.cc (modified) (2 diffs)

trunk/pdns/pdns/lwres.cc

@@ -58 +58 @@
     Never throws! 
  */
-int asyncresolve(const ComboAddress& ip, const string& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, LWResult *lwr)
+int asyncresolve(const ComboAddress& ip, const string& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, LWResultResult *lwr)
 {
   int len; 
@@ -184 +184 @@
     for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {          
       DNSResourceRecord rr;
+      rr.priority = 0;
       rr.qtype=i->first.d_type;
       rr.qname=i->first.d_label;

trunk/pdns/pdns/syncres.cc

@@ -957 +957 @@
             if(rr.qtype.getCode() == QType::NS) // people fiddle with the case
               rr.content=toLower(rr.content); // this must stay! (the cache can't be case-insensitive on the RHS of records)
+            
             tcache[make_pair(i->qname,i->qtype)].insert(rr);
           }
@@ -1030 +1031 @@
            lwr.d_rcode==RCode::NoError) {
           LOG<<prefix<<qname<<": got negative caching indication for '"<< (qname+"|"+i->qtype.getName()+"'") <<endl;
-          ret.push_back(*i);
+          if(!newtarget.empty())
+            ret.push_back(*i);
           
           NegCacheEntry ne;