sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s3: libads: Don't re-do DNS lookups in ads_current_time() if not needed.

Browse Source 
ADS_STRUCT may be being reused after a
DC lookup from ads_find_dc(), so ads->ldap.ss may already have a
good address (even if ads->server.ldap_server == NULL).
Only re-initialize the ADS_STRUCT and redo the ads_find_fc()
DNS lookups if we have to.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Jeremy Allison 2020-07-22 19:00:52 -07:00 committed by Andreas Schneider
parent c863cc2ba3
commit 1d066f37b9
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/libads/ldap.c
View File

@ -3272,11 +3272,28 @@ ADS_STATUS ads_current_time(ADS_STRUCT *ads)
/* establish a new ldap tcp session if necessary */
if ( !ads->ldap.ld ) {
if ( (ads_s = ads_init( ads->server.realm, ads->server.workgroup,
ads->server.ldap_server, ADS_SASL_PLAIN )) == NULL )
{
status = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
/*
* ADS_STRUCT may be being reused after a
* DC lookup, so ads->ldap.ss may already have a
* good address. If not, re-initialize the passed-in
* ADS_STRUCT with the given server.XXXX parameters.
*
* Note that this doesn't depend on
* ads->server.ldap_server != NULL,
* as the case where ads->server.ldap_server==NULL and
* ads->ldap.ss != zero_address is precisely the DC
* lookup case where ads->ldap.ss was found by going
* through ads_find_dc() again we want to avoid repeating.
*/
if (is_zero_addr(&ads->ldap.ss)) {
ads_s = ads_init(ads->server.realm,
ads->server.workgroup,
ads->server.ldap_server,
ADS_SASL_PLAIN );
if (ads_s == NULL) {
status = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
}
ads_s->auth.flags = ADS_AUTH_ANON_BIND;
status = ads_connect( ads_s );