From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 1 Jun 2015 22:16:54 +0000 (+0200)
Subject: more toString() in zoneparser, zone2sql is alive
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~58^2~21^2~5^2~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=262536fa7412e395c2853ad000ed396c3e3fae1e;p=pdns

more toString() in zoneparser, zone2sql is alive
---

diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 9415d68d4..3f9dedfd4 100644
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -391,7 +391,7 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
     stringtok(recparts, rr.content);
     if(recparts.size()==2) {
       if (recparts[1]!=".")
-        recparts[1] = stripDot(toCanonic(d_zonename, recparts[1]));
+        recparts[1] = stripDot(toCanonic(d_zonename.toString(), recparts[1]));
       rr.content=recparts[0]+" "+recparts[1];
     }
     break;
@@ -399,8 +399,8 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
   case QType::RP:
     stringtok(recparts, rr.content);
     if(recparts.size()==2) {
-      recparts[0] = stripDot(toCanonic(d_zonename, recparts[0]));
-      recparts[1] = stripDot(toCanonic(d_zonename, recparts[1]));
+      recparts[0] = stripDot(toCanonic(d_zonename.toString(), recparts[0]));
+      recparts[1] = stripDot(toCanonic(d_zonename.toString(), recparts[1]));
       rr.content=recparts[0]+" "+recparts[1];
     }
     break;
@@ -409,7 +409,7 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
     stringtok(recparts, rr.content);
     if(recparts.size()==4) {
       if(recparts[3]!=".")
-        recparts[3] = stripDot(toCanonic(d_zonename, recparts[3]));
+        recparts[3] = stripDot(toCanonic(d_zonename.toString(), recparts[3]));
       rr.content=recparts[0]+" "+recparts[1]+" "+recparts[2]+" "+recparts[3];
     }
     break;
@@ -420,14 +420,14 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
   case QType::DNAME:
   case QType::PTR:
   case QType::AFSDB:
-    rr.content=stripDot(toCanonic(d_zonename, rr.content));
+    rr.content=stripDot(toCanonic(d_zonename.toString(), rr.content));
     break;
 
   case QType::SOA:
     stringtok(recparts, rr.content);
     if(recparts.size() > 1) {
-      recparts[0]=toCanonic(d_zonename, recparts[0]);
-      recparts[1]=toCanonic(d_zonename, recparts[1]);
+      recparts[0]=toCanonic(d_zonename.toString(), recparts[0]);
+      recparts[1]=toCanonic(d_zonename.toString(), recparts[1]);
     }
     rr.content.clear();
     for(string::size_type n = 0; n < recparts.size(); ++n) {