sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

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

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
This commit is contained in:
Jeremy Allison 2020-09-09 09:48:25 -07:00 committed by Noel Power
parent 178bd3847b
commit 3b1542a1e9
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/libsmb/namequery.c
View File

@ -3742,7 +3742,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
struct sockaddr_storage **return_ss_arr, struct sockaddr_storage **return_ss_arr,
unsigned int *p_num_entries) unsigned int *p_num_entries)
{ {
struct ip_service *ss_list = NULL; struct samba_sockaddr *sa_list = NULL;
char *sitename = NULL; char *sitename = NULL;
size_t count = 0; size_t count = 0;
size_t i; size_t i;
@ -3766,11 +3766,11 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
sitename = sitename_fetch(ctx, lp_realm()); /* wild guess */ sitename = sitename_fetch(ctx, lp_realm()); /* wild guess */
status = _internal_resolve_name(ctx, status = internal_resolve_name(ctx,
name, name,
name_type, name_type,
sitename, sitename,
&ss_list, &sa_list,
&count, &count,
lp_name_resolve_order()); lp_name_resolve_order());
TALLOC_FREE(sitename); TALLOC_FREE(sitename);
@ -3781,16 +3781,8 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
/* only return valid addresses for TCP connections */ /* only return valid addresses for TCP connections */
for (i=0, num_entries = 0; i<count; i++) { for (i=0, num_entries = 0; i<count; i++) {
struct samba_sockaddr sa = {0}; if (!is_zero_addr(&sa_list[i].u.ss) &&
bool ok; !is_broadcast_addr(&sa_list[i].u.sa)) {
ok = sockaddr_storage_to_samba_sockaddr(&sa,
&ss_list[i].ss);
if (!ok) {
continue;
}
if (!is_zero_addr(&sa.u.ss) &&
!is_broadcast_addr(&sa.u.sa)) {
num_entries++; num_entries++;
} }
} }
@ -3808,17 +3800,9 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
} }
for (i=0, num_entries = 0; i<count; i++) { for (i=0, num_entries = 0; i<count; i++) {
struct samba_sockaddr sa = {0}; if (!is_zero_addr(&sa_list[i].u.ss) &&
bool ok; !is_broadcast_addr(&sa_list[i].u.sa)) {
result_arr[num_entries++] = sa_list[i].u.ss;
ok = sockaddr_storage_to_samba_sockaddr(&sa,
&ss_list[i].ss);
if (!ok) {
continue;
}
if (!is_zero_addr(&sa.u.ss) &&
!is_broadcast_addr(&sa.u.sa)) {
result_arr[num_entries++] = ss_list[i].ss;
} }
} }
@ -3832,7 +3816,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
*p_num_entries = num_entries; *p_num_entries = num_entries;
*return_ss_arr = result_arr; *return_ss_arr = result_arr;
done: done:
TALLOC_FREE(ss_list); TALLOC_FREE(sa_list);
return status; return status;
} }