1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00

s4:password_hash LDB module - support this new password set syntax

This commit is contained in:
Matthias Dieter Wallnöfer 2010-08-15 10:20:48 +02:00
parent 6dc0c07a51
commit 33bb063b05

View File

@ -2431,10 +2431,18 @@ static int password_hash_modify(struct ldb_module *module, struct ldb_request *r
++rep_attr_cnt; ++rep_attr_cnt;
} }
if ((passwordAttr->num_values != 1) && if ((passwordAttr->num_values != 1) &&
(passwordAttr->flags != LDB_FLAG_MOD_REPLACE)) { (passwordAttr->flags == LDB_FLAG_MOD_ADD)) {
talloc_free(ac); talloc_free(ac);
ldb_asprintf_errstring(ldb, ldb_asprintf_errstring(ldb,
"'%s' attributes must have exactly one value!", "'%s' attribute must have exactly one value on add operations!",
*l);
return LDB_ERR_CONSTRAINT_VIOLATION;
}
if ((passwordAttr->num_values > 1) &&
(passwordAttr->flags == LDB_FLAG_MOD_DELETE)) {
talloc_free(ac);
ldb_asprintf_errstring(ldb,
"'%s' attribute must have zero or one value(s) on delete operations!",
*l); *l);
return LDB_ERR_CONSTRAINT_VIOLATION; return LDB_ERR_CONSTRAINT_VIOLATION;
} }