diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-10-21 12:12:10 +1300 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-12-03 12:50:18 +0100 |
| commit | 1cc564ada17215f32d1b6163984b2c6cb8d5646b (patch) | |
| tree | 4b42b35b078cc85c3a2dccf5b5f517f273290a38 | |
| parent | a67944da822fad7b9e7942ac7877d9fe24efa2ec (diff) | |
| download | samba-1cc564ada17215f32d1b6163984b2c6cb8d5646b.tar.gz | |
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>
| -rw-r--r-- | source4/rpc_server/dnsserver/dnsdata.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c index 59e29f029a6..f991f4042e3 100644 --- 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; } |