summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-07 22:37:39 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-08 11:27:03 +0000
commitd4c9a34cf82abea5497dc2a8072ed2a67894e0ea (patch)
treeff9cd6206ad8c503a1dfad2e98321dbcd6999e5c /source4
parentacffe258960c261903eefce630bbf02acbef1348 (diff)
downloadsamba-d4c9a34cf82abea5497dc2a8072ed2a67894e0ea.tar.gz
samba-d4c9a34cf82abea5497dc2a8072ed2a67894e0ea.tar.bz2
samba-d4c9a34cf82abea5497dc2a8072ed2a67894e0ea.zip
s4:acl LDB module - define the delete passwords special case a bit better
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/acl.c7
1 files changed, 4 insertions, 3 deletions
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;
}