From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 27 Sep 2015 22:06:35 +0000 (+0200)
Subject: fix up p11 plus binddnssec DNSName adjustments
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~28^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8afb726c9301a1585aee8268a34aec00f2fac5f;p=thirdparty%2Fpdns.git

fix up p11 plus binddnssec DNSName adjustments
---

diff --git a/modules/bindbackend/binddnssec.cc b/modules/bindbackend/binddnssec.cc
index 2660439d80..30bc7f8cd8 100644
--- a/modules/bindbackend/binddnssec.cc
+++ b/modules/bindbackend/binddnssec.cc
@@ -369,8 +369,8 @@ bool Bind2Backend::getTSIGKey(const DNSName& name, DNSName* algorithm, string* c
     content->clear();
     while(d_getTSIGKeyQuery_stmt->hasNextRow()) {
       d_getTSIGKeyQuery_stmt->nextRow(row);
-      if(row.size() >= 2 && (algorithm->empty() || *algorithm == row[0])) {
-        *algorithm = row[0];
+      if(row.size() >= 2 && (algorithm->empty() || *algorithm == DNSName(row[0]))) {
+        *algorithm = DNSName(row[0]);
         *content = row[1];
       }
     }
@@ -432,8 +432,8 @@ bool Bind2Backend::getTSIGKeys(std::vector< struct TSIGKey > &keys)
     while(d_getTSIGKeysQuery_stmt->hasNextRow()) {
       d_getTSIGKeysQuery_stmt->nextRow(row);
       struct TSIGKey key;
-      key.name = row[0];
-      key.algorithm = row[1];
+      key.name = DNSName(row[0]);
+      key.algorithm = DNSName(row[1]);
       key.key = row[2];
       keys.push_back(key);
     }
diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index f006cf5e01..c56ac8f500 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -2178,7 +2178,7 @@ try
         return 1;
       }
 
-      string zone = cmds[2];
+      DNSName zone(cmds[2]);
 
       // verify zone
       if (!B.getDomainInfo(zone, di)) {
@@ -2257,7 +2257,7 @@ try
         return 1;
       }
       DomainInfo di;
-      string zone = cmds[2];
+      DNSName zone(cmds[2]);
       unsigned int id;
       int bits = 2048;
       // verify zone