The branch, master has been updated
via 2a8650e s4-resolver: fix bug with DNS servers returning AAAA
records when asked for A records
from 2898485 Move the SEC_DIR_LIST check into dptr_create for SMB2 and
now for SMB1.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2a8650ed79ef389e76caa7ce45ddcb2c682f56f6
Author: Matthieu Patou <m...@matws.net>
Date: Sun Nov 6 00:23:41 2011 +0100
s4-resolver: fix bug with DNS servers returning AAAA records when asked for
A records
Autobuild-User: Matthieu Patou <m...@samba.org>
Autobuild-Date: Sun Nov 6 03:18:00 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source4/libcli/resolve/dns_ex.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index 993ef43..20f2c0c 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -196,6 +196,8 @@ static struct dns_records_container
get_a_aaaa_records(TALLOC_CTX *mem_ctx,
return ret;
}
+ /* Some servers (Microsoft at least return here AAAA
records .... */
+ count += count_dns_rr(reply2->head, rk_ns_t_aaaa);
count2 = count_dns_rr(reply2->head, rk_ns_t_a);
} else {
reply2 = NULL;
@@ -241,8 +243,8 @@ static struct dns_records_container
get_a_aaaa_records(TALLOC_CTX *mem_ctx,
if (!rr->u.data) {
continue;
}
- rr_to_string(mem_ctx, rr, port);
- addrs[total] = rr_to_string(mem_ctx, rr, port);
+
+ addrs[total] = rr_to_string(addrs, rr, port);
if (addrs[total]) {
total++;
}
--
Samba Shared Repository
