r12763: Oops. If you call ldb_search from within an ldb module's search

request handler, you really have to watch the recursion issues...

Andrew Bartlett
(This used to be commit 46628e86a2be6d334b2d0427e7052517c7ab1d4c)

diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 09d8e825765e20c596a1366997b3f602fb9b6307..cc6a0d18f4bc68466795da1f2c5a67638343fc30 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -91,7 +91,9 @@ static int kludge_acl_search(struct ldb_module *module, struct ldb_request *req)
        struct kludge_private_data *data = talloc_get_type(module->private_data, struct kludge_private_data);
        int i, j;
 
-       if (ret != LDB_SUCCESS) {
+       /* We may not be fully initialised yet, or we might have just
+        * got an error */
+       if (ret != LDB_SUCCESS || !data->password_attrs) {
                return ret;
        }