diff options
author | Jeremy Allison <jra@samba.org> | 2020-09-08 16:36:40 -0700 |
---|---|---|
committer | Noel Power <npower@samba.org> | 2020-09-15 10:09:38 +0000 |
commit | 5a448e96ace9a6f42f09d1e9915580f3557e21cd (patch) | |
tree | 8e11edf0e53281c431826d12424b0208f1d7c328 /source3/libads | |
parent | 6be32826d7a09c0c0f337eae36d3e0a8448c202a (diff) | |
download | samba-5a448e96ace9a6f42f09d1e9915580f3557e21cd.tar.gz |
s3: libads: Make resolve_and_ping_dns() use get_sorted_dc_list_sa().
We no longer use cldap_ping_list(), comment it out
for removal.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'source3/libads')
-rwxr-xr-x | source3/libads/ldap.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 12cbe58acbb..2a0c5f13219 100755 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -340,6 +340,7 @@ static bool ads_try_connect(ADS_STRUCT *ads, bool gc, return ret; } +#if 0 /********************************************************************** send a cldap ping to list of servers, one at a time, until one of them answers it's an ldap server. Record success in the ADS_STRUCT. @@ -377,6 +378,7 @@ static NTSTATUS cldap_ping_list(ADS_STRUCT *ads, return NT_STATUS_NO_LOGON_SERVERS; } +#endif /********************************************************************** send a cldap ping to list of servers, one at a time, until one of @@ -476,26 +478,26 @@ static NTSTATUS resolve_and_ping_dns(ADS_STRUCT *ads, const char *sitename, const char *realm) { size_t count = 0; - struct ip_service *ip_list = NULL; + struct samba_sockaddr *sa_list = NULL; NTSTATUS status; DEBUG(6, ("resolve_and_ping_dns: (cldap) looking for realm '%s'\n", realm)); - status = get_sorted_dc_list(talloc_tos(), + status = get_sorted_dc_list_sa(talloc_tos(), realm, sitename, - &ip_list, + &sa_list, &count, true); if (!NT_STATUS_IS_OK(status)) { - TALLOC_FREE(ip_list); + TALLOC_FREE(sa_list); return status; } - status = cldap_ping_list(ads, realm, ip_list, count); + status = cldap_ping_list_sa(ads, realm, sa_list, count); - TALLOC_FREE(ip_list); + TALLOC_FREE(sa_list); return status; } |