From c1a295ca6e0472a2a5e4b845f0d60df8419d0508 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Sat, 2 Jan 2016 19:55:35 +0100
Subject: [PATCH] Fix uncaught DNSName build error in DLNotifyHostHandler

---
 pdns/dynhandler.cc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc
index 2a1ae34e6..1356b28ba 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";
 }
 
-- 
2.40.0