Use DNSName

diff --git a/pdns/bindparser.yy b/pdns/bindparser.yy
index 4b9340e2fbb28f5bcbfb25e39e247c8640c6fbe9..2fe5758a23efd1e5f1adfab898d7b9a284fcf152 100644 (file)
--- a/pdns/bindparser.yy
+++ b/pdns/bindparser.yy
@@ -93,7 +93,7 @@ void BindParser::commit(BindDomainInfo DI)
     DI.filename=d_dir+"/"+DI.filename;
 
   if(d_verbose)
-    cerr<<"Domain "<<DI.name<<" lives in file '"<<DI.filename<<"'"<<endl;
+    cerr<<"Domain "<<DI.name.toStringNoDot()<<" lives in file '"<<DI.filename<<"'"<<endl;
 
   d_zonedomains.push_back(DI);
 }

diff --git a/pdns/bindparserclasses.hh b/pdns/bindparserclasses.hh
index fe338f2e3999cb477ed2bf5ce8259bace66b8d91..0dc424e8d98cfbcd2046e13d2898b2d5d1962d1b 100644 (file)
--- a/pdns/bindparserclasses.hh
+++ b/pdns/bindparserclasses.hh
@@ -44,7 +44,7 @@ public:
     d_dev=0;
     d_ino=0;
   }
-  string name;
+  DNSName name;
   string viewName;
   string filename;
   vector<string> masters;
@@ -91,7 +91,7 @@ class BindParser
 private:
   string d_dir;
   bool d_verbose;
-  typedef map<string,string> zonedomain_t;
+  typedef map<DNSName,string> zonedomain_t;
   set<string> alsoNotify;
   vector<BindDomainInfo> d_zonedomains;
 };

diff --git a/pdns/zone2json.cc b/pdns/zone2json.cc
index 72c51ddbc54dc0075746136ff8202d21ea7d859d..17cad46f477f9ef8557ee5a864d8708f0f3132b1 100644 (file)
--- a/pdns/zone2json.cc
+++ b/pdns/zone2json.cc
@@ -200,7 +200,7 @@ try
           ++i)
         {
           if(i->type!="master" && i->type!="slave") {
-            cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name<<"'"<<endl;
+            cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name.toStringNoDot()<<"'"<<endl;
             continue;
           }
           lines.clear(); 
@@ -208,8 +208,8 @@ try
             ZoneParserTNG zpt(i->filename, i->name, BP.getDirectory());
             DNSResourceRecord rr;
             while(zpt.get(rr)) 
-              lines.push_back(emitRecord(i->name, rr.qname, rr.qtype.getName(), rr.content, rr.ttl));
-            cout << "{\"name\":\"" << i->name << "\",\"records\": ";
+              lines.push_back(emitRecord(i->name.toStringNoDot(), rr.qname.toStringNoDot(), rr.qtype.getName(), rr.content, rr.ttl));
+            cout << "{\"name\":\"" << i->name.toStringNoDot() << "\",\"records\": ";
             emitJson(lines);
             cout << "},";
             num_domainsdone++;
@@ -238,7 +238,7 @@ try
       string zname; 
       cout << "{\"name\":\"" << ::arg()["zone-name"] << "\",\"records\":";
       while(zpt.get(rr)) 
-        lines.push_back(emitRecord(::arg()["zone-name"], rr.qname, rr.qtype.getName(), rr.content, rr.ttl));
+        lines.push_back(emitRecord(::arg()["zone-name"], rr.qname.toStringNoDot(), rr.qtype.getName(), rr.content, rr.ttl));
       emitJson(lines);
       cout << "}\n";
       num_domainsdone=1;

diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc
index 9548d6cf585a90812697ffb91586d5c17346a813..dd1f1cd8575445a20d67d38a20bc7b616a4243cf 100644 (file)
--- a/pdns/zone2sql.cc
+++ b/pdns/zone2sql.cc
@@ -389,13 +389,13 @@ try
           ++i)
         {
           if(i->type!="master" && i->type!="slave") {
-            cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name<<"'"<<endl;
+            cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name.toStringNoDot()<<"'"<<endl;
             continue;
           }
           try {
             startNewTransaction();
             
-            emitDomain(i->name, &(i->masters));
+            emitDomain(i->name.toStringNoDot(), &(i->masters));
             
             ZoneParserTNG zpt(i->filename, i->name, BP.getDirectory());
             DNSResourceRecord rr;
@@ -407,7 +407,7 @@ try
               if(rr.qtype.getCode() == QType::SOA)
                 seenSOA=true;
 
-              emitRecord(i->name, rr.qname, rr.qtype.getName(), rr.content, rr.ttl, comment);
+              emitRecord(i->name.toStringNoDot(), rr.qname.toStringNoDot(), rr.qtype.getName(), rr.content, rr.ttl, comment);
             }
             num_domainsdone++;
           }