From 2056b0d9c3feb553882e598042c5b56be4974412 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 24 Aug 2020 11:49:25 -0700
Subject: [PATCH] s3: libsmb: Cleanup - Use samba_sockaddr as intended in
 resolve_name() to make ugly casts go away.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@samba.org>
---
 source3/libsmb/namequery.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index b4babbb0172..464a9b7b4a4 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3394,9 +3394,19 @@ bool resolve_name(const char *name,
 
 		if (prefer_ipv4) {
 			for (i=0; i<count; i++) {
-				if (!is_zero_addr(&ss_list[i].ss) &&
-				    !is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss) &&
-						(ss_list[i].ss.ss_family == AF_INET)) {
+				struct samba_sockaddr sa = {0};
+				bool ok;
+
+				ok = sockaddr_storage_to_samba_sockaddr(&sa,
+								&ss_list[i].ss);
+				if (!ok) {
+					SAFE_FREE(ss_list);
+					TALLOC_FREE(frame);
+					return false;
+				}
+				if (!is_zero_addr(&sa.u.ss) &&
+						!is_broadcast_addr(&sa.u.sa) &&
+						(sa.u.ss.ss_family == AF_INET)) {
 					*return_ss = ss_list[i].ss;
 					SAFE_FREE(ss_list);
 					TALLOC_FREE(frame);
@@ -3407,8 +3417,18 @@ bool resolve_name(const char *name,
 
 		/* only return valid addresses for TCP connections */
 		for (i=0; i<count; i++) {
-			if (!is_zero_addr(&ss_list[i].ss) &&
-			    !is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss)) {
+			struct samba_sockaddr sa = {0};
+			bool ok;
+
+			ok = sockaddr_storage_to_samba_sockaddr(&sa,
+								&ss_list[i].ss);
+			if (!ok) {
+				SAFE_FREE(ss_list);
+				TALLOC_FREE(frame);
+				return false;
+			}
+			if (!is_zero_addr(&sa.u.ss) &&
+					!is_broadcast_addr(&sa.u.sa)) {
 				*return_ss = ss_list[i].ss;
 				SAFE_FREE(ss_list);
 				TALLOC_FREE(frame);