ldb: fixed --paged option in ldb tools

we were sometimes using 'paged_result' and sometimes using 'paged_results'.
The latter seemed to be more common, so I changed the two places that
used the 'paged_result' string to 'paged_results'

diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index a49dbf0023f11bd4f7960a43a2c5af5d8b297d35..4f2044bf76d10b6c9ade256b8fbf657c5c6d4d32 100755 (executable)
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2655,7 +2655,7 @@ nTSecurityDescriptor:: """ + desc_base64
         """Testing that if we request a control that return a control it
            really return something"""
         res = self.ldb.search(attrs=["cn"],
-                              controls=["paged_result:1:10"])
+                              controls=["paged_results:1:10"])
         self.assertEquals(len(res.controls), 1)
         self.assertEquals(res.controls[0].oid, "1.2.840.113556.1.4.319")
         try:

diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 49f8222d49c4cac172ee04905783b7ab09214de2..f5d5940ae3d928ad2f628781efb563858c7cba51 100644 (file)
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -532,7 +532,7 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void *opaque);
    \sa <a href="http://www.ietf.org/rfc/rfc2696.txt">RFC 2696</a>.
 */
 #define LDB_CONTROL_PAGED_RESULTS_OID  "1.2.840.113556.1.4.319"
-#define LDB_CONTROL_PAGED_RESULTS_NAME "paged_result"
+#define LDB_CONTROL_PAGED_RESULTS_NAME "paged_results"
 
 /**
    OID for specifying the returned elements of the ntSecurityDescriptor