From bdf59b2bbbf832b4557909be3b613855f89389ee Mon Sep 17 00:00:00 2001
From: Shreyas Zare <shreyas@technitium.com>
Date: Sat, 23 Nov 2024 13:08:58 +0530
Subject: [PATCH] ZoneTree: updated FindZoneNode() to correctly handle wildcard
 case with ENT subdomain for queries that should return wildcard.

---
 DnsServerCore/Dns/Trees/ZoneTree.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/DnsServerCore/Dns/Trees/ZoneTree.cs b/DnsServerCore/Dns/Trees/ZoneTree.cs
index de01a012..907b1978 100644
--- a/DnsServerCore/Dns/Trees/ZoneTree.cs
+++ b/DnsServerCore/Dns/Trees/ZoneTree.cs
@@ -284,7 +284,6 @@ namespace DnsServerCore.Dns.Trees
                         return null; //no child or wildcard found
 
                     //use wildcard node
-                    //currentNode = wildcardNode; //use wildcard node as current node
                     break;
                 }
 
@@ -312,7 +311,7 @@ namespace DnsServerCore.Dns.Trees
                         NodeValue wildcardValue = wildcardNode.Value;
                         if (wildcardValue is not null)
                         {
-                            if (IsKeySubDomain(wildcardValue.Key, value.Key, matchWildcard))
+                            if (IsKeySubDomain(key, value.Key, false) && IsKeySubDomain(wildcardValue.Key, value.Key, matchWildcard))
                             {
                                 //value is a subdomain of an ENT so wildcard is not valid
                                 wildcardNode = null;