[PATCH 2/2] s3-libads: Use the configured LDAP page size.
Justin Maggard
jmaggard10 at gmail.com
Tue Jul 21 22:13:56 UTC 2015
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 at netgear.com>
---
source3/libads/ads_struct.c | 4 ++--
source3/libads/ldap_utils.c | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index 30d433e..6c77339 100644
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -162,9 +162,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;
}
diff --git a/source3/libads/ldap_utils.c b/source3/libads/ldap_utils.c
index 157f694..a4adbc0 100644
--- a/source3/libads/ldap_utils.c
+++ b/source3/libads/ldap_utils.c
@@ -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));
--
2.4.6
More information about the samba-technical
mailing list