From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Sat, 2 Jan 2016 18:55:28 +0000 (+0100)
Subject: Fix uncaught DNSName build error in DLNotifyRetrieveHandler
X-Git-Tag: dnsdist-1.0.0-alpha2~101^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63faa7c9657e9c5ede85de0c9793bdaf276dbf9a;p=thirdparty%2Fpdns.git

Fix uncaught DNSName build error in DLNotifyRetrieveHandler
---

diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc
index 7aff1d8cf0..2a1ae34e6c 100644
--- a/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc
@@ -235,18 +235,24 @@ string DLNotifyRetrieveHandler(const vector<string>&parts, Utility::pid_t ppid)
   if(parts.size()!=2)
     return "syntax: retrieve domain";
 
-  const string& domain=parts[1];
+  DNSName domain;
+  try {
+    domain = DNSName(parts[1]);
+  } catch (...) {
+    return "Failed to parse domain as valid DNS name";
+  }
+
   DomainInfo di;
   UeberBackend B;
-  if(!B.getDomainInfo(DNSName(domain), di))
-    return "Domain '"+domain+"' unknown";
+  if(!B.getDomainInfo(domain, di))
+    return "Domain '"+domain.toString()+"' unknown";
   
   if(di.masters.empty())
-    return "Domain '"+domain+"' is not a slave domain (or has no master defined)";
+    return "Domain '"+domain.toString()+"' is not a slave domain (or has no master defined)";
 
   random_shuffle(di.masters.begin(), di.masters.end());
-  Communicator.addSuckRequest(DNSName(domain), di.masters.front());
-  return "Added retrieval request for '"+domain+"' from master "+di.masters.front();
+  Communicator.addSuckRequest(domain, di.masters.front());
+  return "Added retrieval request for '"+domain.toString()+"' from master "+di.masters.front();
 }
 
 string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid)