From d4c9a34cf82abea5497dc2a8072ed2a67894e0ea Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sun, 7 Nov 2010 22:37:39 +0100 Subject: s4:acl LDB module - define the delete passwords special case a bit better --- source4/dsdb/samdb/ldb_modules/acl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/dsdb') diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c index 0a7f431c37..3cf768e522 100644 --- a/source4/dsdb/samdb/ldb_modules/acl.c +++ b/source4/dsdb/samdb/ldb_modules/acl.c @@ -570,9 +570,10 @@ static int acl_check_password_rights(TALLOC_CTX *mem_ctx, ldb_msg_remove_element(msg, el); } } - /* a single delete will be handled by password hash - later in the stack, so we let it though here */ - if (del_attr_cnt > 0 && add_attr_cnt == 0) { + + /* single deletes will be handled by the "password_hash" LDB module + * later in the stack, so we let it though here */ + if ((del_attr_cnt > 0) && (add_attr_cnt == 0) && (rep_attr_cnt == 0)) { talloc_free(tmp_ctx); return LDB_SUCCESS; } -- cgit