From f7453121cc871017732627b3383ab6acc42ee791 Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 11 Dec 2015 01:30:44 +0100
Subject: [PATCH] traling dot in DNAME content

---
 modules/bindbackend/bindbackend2.cc | 1 +
 pdns/dnsrecords.cc                  | 3 ++-
 pdns/pdnssec.cc                     | 2 +-
 pdns/resolver.cc                    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 39abbd30c7..de879f2b8d 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -276,6 +276,7 @@ bool Bind2Backend::feedRecord(const DNSResourceRecord &r, string *ordername)
     *d_of<<qname<<"\t"<<r.ttl<<"\t"<<r.qtype.getName()<<"\t"<<r.priority<<"\t"<<content<<endl;
     break;
   case QType::CNAME:
+  case QType::DNAME:
   case QType::NS:
     if(!stripDomainSuffix(&content, domain))
       content=stripDot(content)+".";
diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 413051d7f1..d9ee49a906 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -26,7 +26,7 @@
 
 void DNSResourceRecord::setContent(const string &cont) {
   content = cont;
-  if(!content.empty() && (qtype==QType::MX || qtype==QType::NS || qtype==QType::CNAME))
+  if(!content.empty() && (qtype==QType::MX || qtype==QType::NS || qtype==QType::CNAME || qtype==QType::DNAME))
     boost::erase_tail(content, 1);
 
   if(qtype.getCode() == QType::MX) {
@@ -58,6 +58,7 @@ string DNSResourceRecord::getZoneRepresentation() const {
       if (*(content.rbegin()) != '.') ret<<".";
     break;
     case QType::CNAME:
+    case QType::DNAME:
     case QType::NS:
       ret<<content;
       if (*(content.rbegin()) != '.') ret<<".";
diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 539a6db104..63defb4c06 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -607,7 +607,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       numerrors++;
     }
 
-    if ( (rr.qtype.getCode() == QType::NS || rr.qtype.getCode() == QType::SRV || rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::CNAME) &&
+    if ( (rr.qtype.getCode() == QType::NS || rr.qtype.getCode() == QType::SRV || rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::CNAME || rr.qtype.getCode() == QType::DNAME) &&
          rr.content[rr.content.size()-1] == '.') {
       cout<<"[Warning] The record "<<rr.qname<<" with type "<<rr.qtype.getName()<<" has a trailing dot in the content ("<<rr.content<<"). Your backend might not work well with this."<<endl;
       numwarnings++;
diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index d0357167bb..501ee2554b 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -203,7 +203,7 @@ static int parseResult(MOADNSParser& mdp, const std::string& origQname, uint16_t
 
     uint16_t qtype=rr.qtype.getCode();
 
-    if(!rr.content.empty() && (qtype==QType::MX || qtype==QType::NS || qtype==QType::CNAME))
+    if(!rr.content.empty() && (qtype==QType::MX || qtype==QType::NS || qtype==QType::CNAME || qtype==QType::DNAME))
       boost::erase_tail(rr.content, 1);
 
     if(rr.qtype.getCode() == QType::MX) {
-- 
2.47.2