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

s3: libsmb: Convert resolve_name() 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 368c5f8bec0..f172cb5d0a9 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3677,7 +3677,7 @@ bool resolve_name(const char *name,
 		int name_type,
 		bool prefer_ipv4)
 {
-	struct ip_service *ss_list = NULL;
+	struct samba_sockaddr *sa_list = NULL;
 	char *sitename = NULL;
 	size_t count = 0;
 	NTSTATUS status;
@@ -3691,11 +3691,11 @@ bool resolve_name(const char *name,
 
 	sitename = sitename_fetch(frame, lp_realm()); /* wild guess */
 
-	status = _internal_resolve_name(frame,
+	status = internal_resolve_name(frame,
 					name,
 					name_type,
 					sitename,
-					&ss_list,
+					&sa_list,
 					&count,
 					lp_name_resolve_order());
 	if (NT_STATUS_IS_OK(status)) {
@@ -3703,20 +3703,10 @@ bool resolve_name(const char *name,
 
 		if (prefer_ipv4) {
 			for (i=0; i<count; i++) {
-				struct samba_sockaddr sa = {0};
-				bool ok;
-
-				ok = sockaddr_storage_to_samba_sockaddr(&sa,
-								&ss_list[i].ss);
-				if (!ok) {
-					TALLOC_FREE(ss_list);
-					TALLOC_FREE(frame);
-					return false;
-				}
-				if (!is_broadcast_addr(&sa.u.sa) &&
-						(sa.u.ss.ss_family == AF_INET)) {
-					*return_ss = ss_list[i].ss;
-					TALLOC_FREE(ss_list);
+				if (!is_broadcast_addr(&sa_list[i].u.sa) &&
+						(sa_list[i].u.ss.ss_family == AF_INET)) {
+					*return_ss = sa_list[i].u.ss;
+					TALLOC_FREE(sa_list);
 					TALLOC_FREE(frame);
 					return True;
 				}
@@ -3725,26 +3715,16 @@ bool resolve_name(const char *name,
 
 		/* only return valid addresses for TCP connections */
 		for (i=0; i<count; i++) {
-			struct samba_sockaddr sa = {0};
-			bool ok;
-
-			ok = sockaddr_storage_to_samba_sockaddr(&sa,
-								&ss_list[i].ss);
-			if (!ok) {
-				TALLOC_FREE(ss_list);
-				TALLOC_FREE(frame);
-				return false;
-			}
-			if (!is_broadcast_addr(&sa.u.sa)) {
-				*return_ss = ss_list[i].ss;
-				TALLOC_FREE(ss_list);
+			if (!is_broadcast_addr(&sa_list[i].u.sa)) {
+				*return_ss = sa_list[i].u.ss;
+				TALLOC_FREE(sa_list);
 				TALLOC_FREE(frame);
 				return True;
 			}
 		}
 	}
 
-	TALLOC_FREE(ss_list);
+	TALLOC_FREE(sa_list);
 	TALLOC_FREE(frame);
 	return False;
 }