Change default LDAP page size to 1000.

This matches Windows' Active Directory maximum page size.

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

diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml b/docs-xml/smbdotconf/ldap/ldappagesize.xml
index 81cd98a47727831cb711baac7e099bfbb32657b9..577ea2ae2d1463e9175680b90dbd93aeb70cff97 100644 (file)
--- a/docs-xml/smbdotconf/ldap/ldappagesize.xml
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -12,6 +12,6 @@
        This parameter specifies the size of these pages.
        </para>
 </description>
-<value type="default">1024</value>
+<value type="default">1000</value>
 <value type="example">512</value>
 </samba:parameter>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index e5e3a30b9a83a4e579a8cb713c1903e593c9a20d..9b36c7e368449f99d97e384bd1102cbbf8b606b7 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2744,7 +2744,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
        lpcfg_do_global_parameter(lp_ctx, "allocation roundup size", "1048576");
 
-       lpcfg_do_global_parameter(lp_ctx, "ldap page size", "1024");
+       lpcfg_do_global_parameter(lp_ctx, "ldap page size", "1000");
 
        lpcfg_do_global_parameter(lp_ctx, "kernel share modes", "yes");
 

diff --git a/source3/include/smb_ldap.h b/source3/include/smb_ldap.h
index eaa127676b9ab36f3eeaf90ef17ba693715e3193..19e4be5a3169118441ca9d1b23649c11102f3c22 100644 (file)
--- a/source3/include/smb_ldap.h
+++ b/source3/include/smb_ldap.h
@@ -78,7 +78,7 @@ struct ldapsam_privates;
 
 #define LDAP_DEFAULT_TIMEOUT   15
 #define LDAP_CONNECTION_DEFAULT_TIMEOUT 2
-#define LDAP_PAGE_SIZE 1024
+#define LDAP_PAGE_SIZE 1000
 
 #define ADS_PAGE_CTL_OID       "1.2.840.113556.1.4.319"