sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

ldap: Use netlogon_pings

Browse Source 
This already requests the flags that ads_fill_cldap_reply() will later
check for, so netlogon_pings will only feed sufficient DCs into
ads_fill_cldap_reply.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2024-10-25 17:25:13 +02:00
parent df2844ca8f
commit 8a88f322db
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/libads/ldap.c
View File

@ -25,6 +25,7 @@
#include "ads.h"
#include "libads/sitename_cache.h"
#include "libads/cldap.h"
#include "libads/netlogon_ping.h"
#include "../lib/tsocket/tsocket.h"
#include "../lib/addns/dnsquery.h"
#include "../libds/common/flags.h"
@ -423,7 +424,6 @@ static NTSTATUS cldap_ping_list(ADS_STRUCT *ads,
struct timeval endtime = timeval_current_ofs(MAX(3,lp_ldap_timeout()/2), 0);
uint32_t nt_version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
struct tsocket_address **ts_list = NULL;
const struct tsocket_address * const *ts_list_const = NULL;
struct samba_sockaddr **req_sa_list = NULL;
struct netlogon_samlogon_response **responses = NULL;
size_t num_requests = 0;
@ -499,15 +499,22 @@ again:
return status;
}
ts_list_const = (const struct tsocket_address * const *)ts_list;
status = cldap_multi_netlogon(frame,
ts_list_const, num_requests,
ads->server.realm, NULL,
nt_version,
1, endtime, &responses);
status = netlogon_pings(frame, /* mem_ctx */
lp_client_netlogon_ping_protocol(), /* proto */
ts_list, /* servers */
num_requests, /* num_servers */
(struct netlogon_ping_filter){
.ntversion = nt_version,
.domain = ads->server.realm,
.acct_ctrl = -1,
.required_flags = ads->config.flags |
DS_ONLY_LDAP_NEEDED,
},
1, /* min_servers */
endtime, /* timeout */
&responses);
if (!NT_STATUS_IS_OK(status)) {
DBG_WARNING("cldap_multi_netlogon(realm=%s, num_requests=%zu) "
DBG_WARNING("netlogon_pings(realm=%s, num_requests=%zu) "
"for count[%zu] - %s\n",
ads->server.realm,
num_requests, count,