From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 20 Oct 2019 23:12:10 +0000 (+1300)
Subject: CVE-2019-14861: s4-rpc_server: Remove special case for @ in dns_build_tree()
X-Git-Tag: ldb-2.1.0~308
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4333e41c2243781ae788db8ee7fa6897b0a7e334;p=thirdparty%2Fsamba.git

CVE-2019-14861: s4-rpc_server: Remove special case for @ in dns_build_tree()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14138

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index 2dc098a64a0..0739ea3f476 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -801,10 +801,11 @@ struct dns_tree *dns_build_tree(TALLOC_CTX *mem_ctx, const char *name, struct ld
 			goto failed;
 		}
 
-		if (strcmp(ptr, "@") == 0) {
-			base->data = res->msgs[i];
-			continue;
-		} else if (strcasecmp(ptr, name) == 0) {
+		/*
+		 * This might be the sub-domain in the zone being
+		 * requested, or @ for the root of the zone
+		 */
+		if (strcasecmp(ptr, name) == 0) {
 			base->data = res->msgs[i];
 			continue;
 		}