From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 19 Dec 2016 16:43:18 +0000 (+0100)
Subject: Auth: Cleanup `DNSName::getRawLabels()` usage
X-Git-Tag: auth-4.0.2~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e1b4f81ef0e9acc10b98687311b83a09c9f4962;p=thirdparty%2Fpdns.git

Auth: Cleanup `DNSName::getRawLabels()` usage

No real issue I'm aware of, but it's cleaner that way.

(cherry picked from commit f48c35c07dae04ab409f007d242b71692d49d5da)
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 651bc24988..d88155edfa 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -325,7 +325,7 @@ vector<DNSResourceRecord> PacketHandler::getBestDNAMESynth(DNSPacket *p, SOAData
     if(!ret.empty())
       return ret;
     if(subdomain.countLabels())
-      prefix+= DNSName(subdomain.getRawLabels()[0]); // XXX DNSName pain this feels wrong
+      prefix.appendRawLabel(subdomain.getRawLabels()[0]); // XXX DNSName pain this feels wrong
     if(subdomain == sd.qname) // stop at SOA
       break;
 
diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 065b70fd8a..ba05b99d2a 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -638,7 +638,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect
 
   for(const auto &i: tlsas) {
     DNSName name = DNSName(i);
-    name.trimToLabels(name.getRawLabels().size()-2);
+    name.trimToLabels(name.countLabels()-2);
     if (cnames.find(name) == cnames.end() && noncnames.find(name) == noncnames.end()) {
       // No specific record for the name in the TLSA record exists, this
       // is already worth emitting a warning. Let's see if a wildcard exist.