From 39ecff712f0aa6f8c86c3dcad12b068d7b8ccdb7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 27 Aug 2020 11:33:20 -0700 Subject: [PATCH] s3: libsmb: Cleanup - resolve_name() get names from internal_resolve_names() which is guaranteed not to return zero addresses. Signed-off-by: Jeremy Allison Reviewed-by: Noel Power --- source3/libsmb/namequery.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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); -- 2.47.3