sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

s3-libads: Use the configured LDAP page size.

Browse Source 
We already allow the user to configure LDAP page size, and use it in pdb_ldap.
But then we hard-code the initial LDAP page size value to 1000 in ads_init, so
it doesn't take effect there.  So let's use the configured LDAP page size value
in ads_init also, which defaults to 1000.

Signed-off-by: Justin Maggard <jmaggard@netgear.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Jan 15 03:59:16 CET 2016 on sn-devel-144
This commit is contained in:
Justin Maggard 2016-01-13 16:25:34 -08:00 committed by Volker Lendecke
parent 8c2609f318
commit cf05ba5b32
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/libads/ads_struct.c
View File

@ -154,9 +154,9 @@ ADS_STRUCT *ads_init(const char *realm,
ads->auth.flags = wrap_flags;
/* Start with a page size of 1000 when the connection is new,
/* Start with the configured page size when the connection is new,
* we will drop it by half we get a timeout. */
ads->config.ldap_page_size = 1000;
ads->config.ldap_page_size = lp_ldap_page_size();
return ads;
}

4
source3/libads/ldap_utils.c
View File

@ -85,7 +85,9 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind
while (--count) {
if (NT_STATUS_EQUAL(ads_ntstatus(status), NT_STATUS_IO_TIMEOUT) && ads->config.ldap_page_size >= 250) {
if (NT_STATUS_EQUAL(ads_ntstatus(status), NT_STATUS_IO_TIMEOUT) &&
ads->config.ldap_page_size >= (lp_ldap_page_size() / 4) &&
lp_ldap_page_size() > 4) {
int new_page_size = (ads->config.ldap_page_size / 2);
DEBUG(1, ("Reducing LDAP page size from %d to %d due to IO_TIMEOUT\n",
ads->config.ldap_page_size, new_page_size));