From: Jeremy Allison <jra@samba.org>
Date: Wed, 9 Sep 2020 01:02:18 +0000 (-0700)
Subject: s3: libsmb: Remove last caller of get_sorted_dc_list() from rpc_dc_name().
X-Git-Tag: talloc-2.3.2~508
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffed032bf09a27c039e8a6a4db024d3ba5ef3d85;p=thirdparty%2Fsamba.git

s3: libsmb: Remove last caller of get_sorted_dc_list() from rpc_dc_name().

Now only get_sorted_dc_list_sa() left.
Now we can remove get_sorted_dc_list() and rename
get_sorted_dc_list_sa() back to get_sorted_dc_list().

One more external user of struct ip_service gone.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
---

diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c
index 212c9c03bd2..75377ce79ce 100644
--- a/source3/libsmb/namequery_dc.c
+++ b/source3/libsmb/namequery_dc.c
@@ -164,7 +164,7 @@ static bool rpc_dc_name(const char *domain,
 			fstring srv_name,
 			struct sockaddr_storage *ss_out)
 {
-	struct ip_service *ip_list = NULL;
+	struct samba_sockaddr *sa_list = NULL;
 	size_t count = 0;
 	struct sockaddr_storage dc_ss;
 	size_t i;
@@ -173,10 +173,10 @@ static bool rpc_dc_name(const char *domain,
 
 	/* get a list of all domain controllers */
 
-	result = get_sorted_dc_list(talloc_tos(),
+	result = get_sorted_dc_list_sa(talloc_tos(),
 				domain,
 				NULL,
-				&ip_list,
+				&sa_list,
 				&count,
 				false);
 	if (!NT_STATUS_IS_OK(result)) {
@@ -187,19 +187,19 @@ static bool rpc_dc_name(const char *domain,
 	/* Remove the entry we've already failed with (should be the PDC). */
 
 	for (i = 0; i < count; i++) {
-		if (is_zero_addr(&ip_list[i].ss))
+		if (is_zero_addr(&sa_list[i].u.ss))
 			continue;
 
-		if (name_status_find(domain, 0x1c, 0x20, &ip_list[i].ss, srv_name)) {
+		if (name_status_find(domain, 0x1c, 0x20, &sa_list[i].u.ss, srv_name)) {
 			result = check_negative_conn_cache( domain, srv_name );
 			if ( NT_STATUS_IS_OK(result) ) {
-				dc_ss = ip_list[i].ss;
+				dc_ss = sa_list[i].u.ss;
 				goto done;
 			}
 		}
 	}
 
-	TALLOC_FREE(ip_list);
+	TALLOC_FREE(sa_list);
 
 	/* No-one to talk to )-: */
 	return False;		/* Boo-hoo */
@@ -215,7 +215,7 @@ static bool rpc_dc_name(const char *domain,
 		  addr, domain));
 
 	*ss_out = dc_ss;
-	TALLOC_FREE(ip_list);
+	TALLOC_FREE(sa_list);
 
 	return True;
 }