From 5f771b301dbb813319ed3aecf5a6b72ed034549a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 7 Apr 2011 09:35:58 +1000 Subject: 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' --- source4/dsdb/tests/python/ldap.py | 2 +- source4/lib/ldb/include/ldb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index a49dbf0023..4f2044bf76 100755 --- 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 49f8222d49..f5d5940ae3 100644 --- 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 RFC 2696. */ #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 -- cgit