From 165e5695feaab963554efcdac759483818650f13 Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 11 Dec 2015 09:39:43 +0100
Subject: [PATCH] traling dot in DNAME content

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

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index a8b71d32e0..c6faaf7938 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -270,6 +270,7 @@ bool Bind2Backend::feedRecord(const DNSResourceRecord &rr, string *ordername)
   case QType::MX:
   case QType::SRV:
   case QType::CNAME:
+  case QType::DNAME:
   case QType::NS:
     if(!stripDomainSuffix(&content, name))
       content=stripDot(content)+".";
diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 8684c2d75f..49c1e2f9ab 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -36,6 +36,7 @@ void DNSResourceRecord::setContent(const string &cont) {
       if (content.size() >= 2 && *(content.rbegin()+1) == ' ')
         return;
     case QType::CNAME:
+    case QType::DNAME:
     case QType::NS:
       if(!content.empty())
         boost::erase_tail(content, 1);
@@ -48,6 +49,7 @@ string DNSResourceRecord::getZoneRepresentation(bool noDot) const {
     case QType::SRV:
     case QType::MX:
     case QType::CNAME:
+    case QType::DNAME:
     case QType::NS:
       if (*(content.rbegin()) != '.') {
         ret<<content;
diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 927658412d..0b80dbe589 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -604,7 +604,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& 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.toString()<<" 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 aa2c502d54..5bf0c65bd5 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -208,6 +208,7 @@ static int parseResult(MOADNSParser& mdp, const DNSName& origQname, uint16_t ori
         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);
-- 
2.47.2