From a46366f0623951d81c060df49ba83d9fc1b50706 Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 15 Jul 2019 10:55:28 +0200
Subject: [PATCH] auth: improve the handling of duplicate id's in bindbackend
 duplicate id's are not allowed in powerdns and will still result in undefined
 behavior

---
 modules/bindbackend/bindbackend2.cc | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index bfd52c1df6..0892271548 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -1067,7 +1067,7 @@ void Bind2Backend::lookup(const QType &qtype, const DNSName &qname, int zoneId,
     g_log<<Logger::Warning<<"Lookup for '"<<qtype.getName()<<"' of '"<<qname<<"' within zoneID "<<zoneId<<endl;
 
   if (zoneId >= 0) {
-    if ((found = safeGetBBDomainInfo(zoneId, &bbd))) {
+    if ((found = (safeGetBBDomainInfo(zoneId, &bbd) && qname.isPartOf(bbd.d_name)))) {
       domain = bbd.d_name;
     }
   } else {
@@ -1079,7 +1079,7 @@ void Bind2Backend::lookup(const QType &qtype, const DNSName &qname, int zoneId,
 
   if(!found) {
     if(mustlog)
-      g_log<<Logger::Warning<<"Found no authoritative zone for "<<qname<<endl;
+      g_log<<Logger::Warning<<"Found no authoritative zone for '"<<qname<<"' and/or id "<<bbd.d_id<<endl;
     d_handle.d_list=false;
     return;
   }
@@ -1088,12 +1088,7 @@ void Bind2Backend::lookup(const QType &qtype, const DNSName &qname, int zoneId,
     g_log<<Logger::Warning<<"Found a zone '"<<domain<<"' (with id " << bbd.d_id<<") that might contain data "<<endl;
 
   d_handle.id=bbd.d_id;
-
-  if(domain.empty())
-    d_handle.qname=qname;
-  else if(qname.isPartOf(domain))
-    d_handle.qname=qname.makeRelative(domain); // strip domain name
-
+  d_handle.qname=qname.makeRelative(domain); // strip domain name
   d_handle.qtype=qtype;
   d_handle.domain=domain;
 
-- 
2.47.2