From: Jeremy Allison <jra@samba.org>
Date: Thu, 27 Aug 2020 18:33:20 +0000 (-0700)
Subject: s3: libsmb: Cleanup - resolve_name() get names from internal_resolve_names() which... 
X-Git-Tag: talloc-2.3.2~582
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39ecff712f0aa6f8c86c3dcad12b068d7b8ccdb7;p=thirdparty%2Fsamba.git

s3: libsmb: Cleanup - resolve_name() get names from internal_resolve_names() which is guaranteed not to return zero addresses.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
---

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 2af14936cdd..f2d5866c372 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3505,8 +3505,7 @@ bool resolve_name(const char *name,
 					TALLOC_FREE(frame);
 					return false;
 				}
-				if (!is_zero_addr(&sa.u.ss) &&
-						!is_broadcast_addr(&sa.u.sa) &&
+				if (!is_broadcast_addr(&sa.u.sa) &&
 						(sa.u.ss.ss_family == AF_INET)) {
 					*return_ss = ss_list[i].ss;
 					TALLOC_FREE(ss_list);
@@ -3528,8 +3527,7 @@ bool resolve_name(const char *name,
 				TALLOC_FREE(frame);
 				return false;
 			}
-			if (!is_zero_addr(&sa.u.ss) &&
-					!is_broadcast_addr(&sa.u.sa)) {
+			if (!is_broadcast_addr(&sa.u.sa)) {
 				*return_ss = ss_list[i].ss;
 				TALLOC_FREE(ss_list);
 				TALLOC_FREE(frame);