From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sat, 2 Jan 2016 17:33:53 +0000 (+0100)
Subject: fix trailing dots in slave zones
X-Git-Tag: dnsdist-1.0.0-alpha2~104^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1813c5ff7e8bbb4eaa1ac83a06dc1ddeeb0de0a5;p=pdns

fix trailing dots in slave zones
---

diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index d0eafe6ec..2343a0309 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -182,10 +182,10 @@ uint16_t Resolver::sendResolve(const ComboAddress& remote, const DNSName &domain
 static int parseResult(MOADNSParser& mdp, const DNSName& origQname, uint16_t origQtype, uint16_t id, Resolver::res_t* result)
 {
   result->clear();
-  
-  if(mdp.d_header.rcode) 
+
+  if(mdp.d_header.rcode)
     return mdp.d_header.rcode;
-      
+
   if(origQname.countLabels()) {  // not AXFR
     if(mdp.d_header.id != id) 
       throw ResolverException("Remote nameserver replied with wrong id");
@@ -194,28 +194,17 @@ static int parseResult(MOADNSParser& mdp, const DNSName& origQname, uint16_t ori
     if(mdp.d_qname != origQname)
       throw ResolverException(string("resolver: received an answer to another question (")+mdp.d_qname.toString()+"!="+ origQname.toString()+".)");
   }
-    
+
   vector<DNSResourceRecord> ret;
   DNSResourceRecord rr;
   for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {
     rr.qname = i->first.d_name;
     rr.qtype = i->first.d_type;
     rr.ttl = i->first.d_ttl;
-    rr.content = i->first.d_content->getZoneRepresentation();
-    switch(rr.qtype.getCode()) {
-      case QType::SRV:
-      case QType::MX:
-        if (rr.content.size() >= 2 && *(rr.content.rbegin()+1) == ' ')
-          break;
-      case QType::CNAME:
-      case QType::DNAME:
-      case QType::NS:
-        if(!rr.content.empty())
-          boost::erase_tail(rr.content, 1);
-    }
+    rr.content = i->first.d_content->getZoneRepresentation(true);
     result->push_back(rr);
   }
-  
+
   return 0;
 }