summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-06-17 12:21:03 +0200
committerVolker Lendecke <vl@samba.org>2008-06-17 12:21:03 +0200
commitee281b747906bab75b766243dac6b0442f81517d (patch)
treea2e6235437ce55e81f928cb94dddf9e9255c30c2
parentaaa2a4f447ea674080aad7bf00eabf9043ef9d4f (diff)
downloadsamba-ee281b747906bab75b766243dac6b0442f81517d.tar.gz
samba-ee281b747906bab75b766243dac6b0442f81517d.tar.bz2
samba-ee281b747906bab75b766243dac6b0442f81517d.zip
Revert "Fix a memleak caused by a crappy get_sorted_dc_list() API"
This reverts commit 2ea03a1e95a30e321e390bef9408a1215711de07. (This used to be commit 80c2e8295a00c3d88372b55b81d03b455feb69b2)
-rw-r--r--source3/winbindd/winbindd_cm.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 860fabbf72..1f1544ea0d 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1167,20 +1167,9 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
sitename = sitename_fetch(domain->alt_name);
if (sitename) {
- NTSTATUS status;
/* Do the site-specific AD dns lookup first. */
- status = get_sorted_dc_list(domain->alt_name,
- sitename, &ip_list,
- &iplist_size, True);
- if (!NT_STATUS_IS_OK(status)) {
- /*
- * Work around a crappy about-to-be-replaced
- * get_sorted_dc_list error handling :-)
- */
- SAFE_FREE(ip_list);
- iplist_size = 0;
- }
+ get_sorted_dc_list(domain->alt_name, sitename, &ip_list, &iplist_size, True);
for ( i=0; i<iplist_size; i++ ) {
char addr[INET6_ADDRSTRLEN];
@@ -1213,8 +1202,6 @@ static bool get_dcs(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
dcs,
num_dcs);
}
- SAFE_FREE(ip_list);
- iplist_size = 0;
}
/* try standard netbios queries if no ADS */