From: Jeremy Allison <jra@samba.org>
Date: Wed, 9 Sep 2020 16:50:32 +0000 (-0700)
Subject: s3: libsmb: Convert find_master_ip() to call internal_resolve_name() not _internal_re... 
X-Git-Tag: talloc-2.3.2~495
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be85a463f45fd62d9f4e904f41388780c1f27f7a;p=thirdparty%2Fsamba.git

s3: libsmb: Convert find_master_ip() to call internal_resolve_name() not _internal_resolve_name().

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

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 25f8c24f8f6..1360f140b1e 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3826,7 +3826,7 @@ done:
 
 bool find_master_ip(const char *group, struct sockaddr_storage *master_ss)
 {
-	struct ip_service *ip_list = NULL;
+	struct samba_sockaddr *sa_list = NULL;
 	size_t count = 0;
 	NTSTATUS status;
 
@@ -3835,35 +3835,35 @@ bool find_master_ip(const char *group, struct sockaddr_storage *master_ss)
 		return false;
 	}
 
-	status = _internal_resolve_name(talloc_tos(),
+	status = internal_resolve_name(talloc_tos(),
 					group,
 					0x1D,
 					NULL,
-					&ip_list,
+					&sa_list,
 					&count,
 					lp_name_resolve_order());
 	if (NT_STATUS_IS_OK(status)) {
-		*master_ss = ip_list[0].ss;
-		TALLOC_FREE(ip_list);
+		*master_ss = sa_list[0].u.ss;
+		TALLOC_FREE(sa_list);
 		return true;
 	}
 
-	TALLOC_FREE(ip_list);
+	TALLOC_FREE(sa_list);
 
-	status = _internal_resolve_name(talloc_tos(),
+	status = internal_resolve_name(talloc_tos(),
 					group,
 					0x1B,
 					NULL,
-					&ip_list,
+					&sa_list,
 					&count,
 					lp_name_resolve_order());
 	if (NT_STATUS_IS_OK(status)) {
-		*master_ss = ip_list[0].ss;
-		TALLOC_FREE(ip_list);
+		*master_ss = sa_list[0].u.ss;
+		TALLOC_FREE(sa_list);
 		return true;
 	}
 
-	TALLOC_FREE(ip_list);
+	TALLOC_FREE(sa_list);
 	return false;
 }