The branch, v3-3-test has been updated via 80c2e8295a00c3d88372b55b81d03b455feb69b2 (commit) via 342f8858200ed7c446516c270e1b4284d92010d8 (commit) from 71f4cf773022525ba617f09c495dbff97f8eb2d5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log ----------------------------------------------------------------- commit 80c2e8295a00c3d88372b55b81d03b455feb69b2 Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Tue Jun 17 12:21:03 2008 +0200 Revert "Fix a memleak caused by a crappy get_sorted_dc_list() API" This reverts commit 2ea03a1e95a30e321e390bef9408a1215711de07. commit 342f8858200ed7c446516c270e1b4284d92010d8 Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Tue Jun 17 12:20:54 2008 +0200 Revert "Fix a memleak in ads_find_dc() in case get_sorted_dc_list() fails" This reverts commit df8d089bc63c2a52cbdf3504cded8df620a59902. ----------------------------------------------------------------------- Summary of changes: source/libads/ldap.c | 1 - source/winbindd/winbindd_cm.c | 15 +-------------- 2 files changed, 1 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libads/ldap.c b/source/libads/ldap.c index fc336d9..37c0c4d 100644 --- a/source/libads/ldap.c +++ b/source/libads/ldap.c @@ -319,7 +319,6 @@ static NTSTATUS ads_find_dc(ADS_STRUCT *ads) status = get_sorted_dc_list(realm, sitename, &ip_list, &count, got_realm); if (!NT_STATUS_IS_OK(status)) { - SAFE_FREE(ip_list); /* fall back to netbios if we can */ if ( got_realm && !lp_disable_netbios() ) { got_realm = False; diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c index 860fabb..1f1544e 100644 --- a/source/winbindd/winbindd_cm.c +++ b/source/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 */ -- Samba Shared Repository