diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-17 12:15:05 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-06-17 12:38:39 +0200 |
| commit | 97a3d510d562f276d2bfe5f9bfd8c0e6d26ac9cd (patch) | |
| tree | 647c0fff3cf52c194f935ea6356f7bb78a4d164f | |
| parent | f457d6e07e8e2359406dc2a81e13b80dadeb4672 (diff) | |
| download | samba-97a3d510d562f276d2bfe5f9bfd8c0e6d26ac9cd.tar.gz | |
Revert "Fix a memleak caused by a crappy get_sorted_dc_list() API"
This reverts commit ba10b9c077272c521504b3a638bba73446efc61c.
(cherry picked from commit 4b3690a730895f6a19b14ee09ca0a2a131c3ba21)
| -rw-r--r-- | source/winbindd/winbindd_cm.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c index 9bfe1dec86c..17bc66ec5d4 100644 --- a/source/winbindd/winbindd_cm.c +++ b/source/winbindd/winbindd_cm.c @@ -1161,20 +1161,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]; @@ -1207,8 +1196,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 */ |