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

Fix uncaught DNSName build error in DLNotifyHostHandler
---

diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc
index 2a1ae34e6c..1356b28ba6 100644
--- a/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc
@@ -264,6 +264,13 @@ string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid)
   if(!::arg().mustDo("master"))
       return "PowerDNS not configured as master";
 
+  DNSName domain;
+  try {
+    domain = DNSName(parts[1]);
+  } catch (...) {
+    return "Failed to parse domain as valid DNS name";
+  }
+
   try {
     ComboAddress ca(parts[2]);
   } catch(...)
@@ -271,8 +278,8 @@ string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid)
     return "Unable to convert '"+parts[2]+"' to an IP address";
   }
   
-  L<<Logger::Warning<<"Notification request to host "<<parts[2]<<" for domain '"<<parts[1]<<"' received from operator"<<endl;
-  Communicator.notify(DNSName(parts[1]), parts[2]);
+  L<<Logger::Warning<<"Notification request to host "<<parts[2]<<" for domain '"<<domain<<"' received from operator"<<endl;
+  Communicator.notify(domain, parts[2]);
   return "Added to queue";
 }