From 4c22f7c57b4481d392578815f7dbc311d3ef4df4 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <cmouse@cmouse.fi>
Date: Tue, 28 Jan 2014 20:23:55 +0200
Subject: [PATCH] Simple fix for the current bugs

---
 pdns/dns.hh                    | 2 +-
 pdns/dnsrecords.cc             | 8 +++++---
 pdns/test-zoneparser_tng_cc.cc | 5 ++++-
 pdns/zoneparser-tng.cc         | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pdns/dns.hh b/pdns/dns.hh
index 2e9d5ef6e1..0b60ee0763 100644
--- 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 f6df0fad96..f540419236 100644
--- 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 a62957c149..7c1a355194 100644
--- 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 0f58f82e4b..c5c03ecff1 100644
--- 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;
-- 
2.47.2