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 59e29f029a675dafa018d9eaec59a4dd4e84e16a..f991f4042e3a88cb16abe9231a4c8f14e269b7a7 100644 (file)
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -795,10 +795,11 @@ struct dns_tree *dns_build_tree(TALLOC_CTX *mem_ctx, const char *name, struct ld
        for (i=0; i<res->count; i++) {
                ptr = ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL);
 
-               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;
                }