Simple fix for the current bugs

diff --git a/pdns/dns.hh b/pdns/dns.hh
index 2e9d5ef6e1b2e2c867a2ad4d9414357a0ff709d4..0b60ee0763a77c9c10d67e7de96b214781014b25 100644 (file)
--- a/pdns/dns.hh
+++ b/pdns/dns.hh
@@ -80,7 +80,7 @@ public:
   ~DNSResourceRecord(){};
 
   void setContent(const string& content);
-  string getZoneRepresentation();
+  string getZoneRepresentation() const;
 
   // data
   

diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index f6df0fad9648201f75381df809351ca0650cc249..f54041923627d062d8053267a12e8ab46a47901a 100644 (file)
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -48,17 +48,19 @@ void DNSResourceRecord::setContent(const string &cont) {
   }
 }
 
-string DNSResourceRecord::getZoneRepresentation() {
+string DNSResourceRecord::getZoneRepresentation() const {
   ostringstream ret;
   switch(qtype.getCode()) {
     case QType::SRV:
     case QType::MX:
       ret<<priority;
-      ret<<" "<<content<<".";
+      ret<<" "<<content;
+      if (*(content.rbegin()) != '.') ret<<".";
     break;
     case QType::CNAME:
     case QType::NS:
-      ret<<content<<".";
+      ret<<content;
+      if (*(content.rbegin()) != '.') ret<<".";
     break;
     default:
       ret<<content;

diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc
index a62957c1497c47a88acca724f10d90115741bcf2..7c1a35519481a7811481e54cd599e11396412f7f 100644 (file)
--- a/pdns/test-zoneparser_tng_cc.cc
+++ b/pdns/test-zoneparser_tng_cc.cc
@@ -33,7 +33,10 @@ BOOST_AUTO_TEST_CASE(test_tng_record_types) {
     BOOST_CHECK_EQUAL(rr.qname, host);
     BOOST_CHECK_EQUAL(rr.ttl, ttl);
     BOOST_CHECK_EQUAL(rr.qtype.getName(), type);
-    BOOST_CHECK_EQUAL(rr.getZoneRepresentation(), data);
+    if (*(rr.content.rbegin()) != '.' && *(data.rbegin()) == '.') 
+      BOOST_CHECK_EQUAL(rr.content, std::string(data.begin(),data.end()-1));
+    else
+      BOOST_CHECK_EQUAL(rr.content, data);
   } 
 
 }

diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 0f58f82e4bf3f9bae6416b249613a2b843512813..c5c03ecff1b079f91ca27e27f8a2d3799f6d7132 100644 (file)
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -379,7 +379,8 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
   case QType::MX:
     stringtok(recparts, rr.content);
     if(recparts.size()==2) {
-      recparts[1] = stripDot(toCanonic(d_zonename, recparts[1]));
+      if (recparts[1]!=".")
+        recparts[1] = stripDot(toCanonic(d_zonename, recparts[1]));
       rr.content=recparts[0]+" "+recparts[1];
     }
     break;