sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: libsmb: namequery. Rename remove_duplicate_addrs2_sa() to remove_duplicate_addrs2()

Browse Source 
It's now the only function.

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 10:46:49 -07:00 committed by Noel Power
parent d627ef1488
commit 526fdaa747
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/libsmb/namequery.c
View File

@ -1233,7 +1233,7 @@ static void sort_sa_list(struct samba_sockaddr *salist, size_t count)
Remove any duplicate address/port pairs in the samba_sockaddr array.
*********************************************************************/
size_t remove_duplicate_addrs2_sa(struct samba_sockaddr *salist, size_t count )
size_t remove_duplicate_addrs2(struct samba_sockaddr *salist, size_t count )
{
size_t i, j;
@ -3222,11 +3222,11 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
&nc_count);
if (ok) {
/*
* remove_duplicate_addrs2_sa() has the
* remove_duplicate_addrs2() has the
* side effect of removing zero addresses,
* so use it here.
*/
nc_count = remove_duplicate_addrs2_sa(sa_list, nc_count);
nc_count = remove_duplicate_addrs2(sa_list, nc_count);
if (nc_count == 0) {
TALLOC_FREE(sa_list);
TALLOC_FREE(frame);
@ -3374,7 +3374,7 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
controllers including the PDC in iplist[1..n]. Iterating over
the iplist when the PDC is down will cause two sets of timeouts. */
ret_count = remove_duplicate_addrs2_sa(sa_list, ret_count);
ret_count = remove_duplicate_addrs2(sa_list, ret_count);
/* Save in name cache */
if ( DEBUGLEVEL >= 100 ) {
@ -3917,7 +3917,7 @@ static NTSTATUS get_dc_list(TALLOC_CTX *ctx,
/* need to remove duplicates in the list if we have any
explicit password servers */
local_count = remove_duplicate_addrs2_sa(return_salist, local_count );
local_count = remove_duplicate_addrs2(return_salist, local_count );
/* For DC's we always prioritize IPv4 due to W2K3 not
* supporting LDAP, KRB5 or CLDAP over IPv6. */

2
source3/libsmb/namequery.h
View File

@ -47,7 +47,7 @@ bool name_status_find(const char *q_name,
int type,
const struct sockaddr_storage *to_ss,
fstring name);
size_t remove_duplicate_addrs2_sa(struct samba_sockaddr *salist, size_t count);
size_t remove_duplicate_addrs2(struct samba_sockaddr *salist, size_t count);
struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
const char *name, int name_type,

2
source3/torture/torture.c
View File

@ -14046,7 +14046,7 @@ static bool run_local_remove_duplicate_addrs2(int dummy)
freeaddrinfo(res);
}
count = remove_duplicate_addrs2_sa(test_vector, i);
count = remove_duplicate_addrs2(test_vector, i);
if (count != 14) {
fprintf(stderr, "count wrong (%zu) should be 14\n",