From 3b2956667ef2eefe9fd7645f49143e259ba601af Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 30 Nov 2015 14:51:13 +0100 Subject: [PATCH] move root-dot method into dnsname --- pdns/dnsname.hh | 1 + pdns/rcpgenerator.cc | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh index 4281cee36a..3c1a2360bd 100644 --- a/pdns/dnsname.hh +++ b/pdns/dnsname.hh @@ -41,6 +41,7 @@ public: std::string toString(const std::string& separator=".", const bool trailing=true) const; //!< Our human-friendly, escaped, representation std::string toStringNoDot() const { return toString(".", false); } + std::string toStringRootDot() const { if(isRoot()) return "."; else return toString(".", false); } std::string toDNSString() const; //!< Our representation in DNS native format void appendRawLabel(const std::string& str); //!< Append this unescaped label void appendRawLabel(const char* start, unsigned int length); //!< Append this unescaped label diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc index 30390108dd..0b691d6711 100644 --- a/pdns/rcpgenerator.cc +++ b/pdns/rcpgenerator.cc @@ -510,10 +510,7 @@ void RecordTextWriter::xfrName(const DNSName& val, bool, bool noDot) d_string.append(1,' '); if(d_nodot) { - if(val.isRoot()) - d_string+="."; - else - d_string+=val.toStringNoDot(); + d_string+=val.toStringRootDot(); } else { -- 2.47.2