From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 21 Nov 2017 19:18:56 +0000 (+0100)
Subject: auth: Fix erroneous merge in zoneparser-tng
X-Git-Tag: auth-4.0.5~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0281441cdd5bdeeee3bcf6e300f2f0fe07357880;p=thirdparty%2Fpdns.git

auth: Fix erroneous merge in zoneparser-tng
---

diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 53149464b3..635adb1074 100644
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -465,7 +465,6 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
     } catch (std::exception &e) {
       throw PDNSException("Error in record '" + rr.qname.toString() + " " + rr.qtype.getName() + "': " + e.what());
     }
-    rr.content=toCanonic(d_zonename, rr.content).toStringRootDot();
     break;
   case QType::AFSDB:
     stringtok(recparts, rr.content);