s4:ldb Allow paged_searches to be mixed with other controls

[kai/samba.git] / source4 / lib / ldb / modules / paged_searches.c

diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index 70b880e2dde7c56340c33174bae8c24503dc00f2..c5430eb9bf1f7965bd6710c7a53b59016d872f3b 100644 (file)
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -230,10 +230,10 @@ static int ps_search(struct ldb_module *module, struct ldb_request *req)
        private_data = talloc_get_type(ldb_module_get_private(module), struct private_data);
        ldb = ldb_module_get_ctx(module);
 
-       /* check if paging is supported and if there is a any control */
-       if (!private_data || !private_data->paged_supported || req->controls) {
+       /* check if paging is supported */
+       if (!private_data || !private_data->paged_supported) {
                /* do not touch this request paged controls not
-                * supported or explicit controls have been set or we
+                * supported or we
                 * are just not setup yet */
                return ldb_next_request(module, req);
        }