summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-08 02:05:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:51 -0500
commit1162b37ff0ce46a578b7e8a6cd92f66a5a1982d9 (patch)
treeab066c266532e2c4a56181b2383cf50588d4042a /source4/dsdb/samdb/ldb_modules
parent8c9d212f2a1984322118257e63f7a3280da6b392 (diff)
downloadsamba-1162b37ff0ce46a578b7e8a6cd92f66a5a1982d9.tar.gz
samba-1162b37ff0ce46a578b7e8a6cd92f66a5a1982d9.tar.bz2
samba-1162b37ff0ce46a578b7e8a6cd92f66a5a1982d9.zip
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)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules')
-rw-r--r--source4/dsdb/samdb/ldb_modules/kludge_acl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 09d8e82576..cc6a0d18f4 100644
--- 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;
}