From: Volker Lendecke <vl@samba.org>
Date: Tue, 17 Jun 2008 10:21:03 +0000 (+0200)
Subject: Revert "Fix a memleak caused by a crappy get_sorted_dc_list() API"
X-Git-Tag: samba-3.3.0pre1~891
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80c2e8295a00c3d88372b55b81d03b455feb69b2;p=thirdparty%2Fsamba.git

Revert "Fix a memleak caused by a crappy get_sorted_dc_list() API"

This reverts commit 2ea03a1e95a30e321e390bef9408a1215711de07.
---

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index 860fabbf721..1f1544ea0d5 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 */