diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2017-06-07 17:45:15 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-06-15 17:33:11 +0200 |
| commit | ece7a75a4261cb9575dee4e7c7fda96e68e6c0c2 (patch) | |
| tree | 1f60ee53259d8850089ffe87f2b198cf6d2cc713 /source4 | |
| parent | e150697a1edae8e65c2282b7c0a50ee06b55fbb8 (diff) | |
| download | samba-ece7a75a4261cb9575dee4e7c7fda96e68e6c0c2.tar.gz | |
repl_meta_data: single valued error codes depend on change type
A replace leads to CONSTRAINT_VIOLATION while an add causes
ATTRIBUTE_OR_VALUE_EXISTS. For this we need to check the mod type
before the replmd_modify_la_* calls because they change everything
into a replace.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index e40449452c1..0ed24cb593e 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -3113,6 +3113,7 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module, for (i=0; i<msg->num_elements; i++) { struct ldb_message_element *el = &msg->elements[i]; struct ldb_message_element *old_el, *new_el; + unsigned int mod_type = LDB_FLAG_MOD_TYPE(el->flags); const struct dsdb_attribute *schema_attr = dsdb_attribute_by_lDAPDisplayName(schema, el->name); if (!schema_attr) { @@ -3134,7 +3135,7 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module, return LDB_ERR_UNWILLING_TO_PERFORM; } old_el = ldb_msg_find_element(old_msg, el->name); - switch (el->flags & LDB_FLAG_MOD_MASK) { + switch (mod_type) { case LDB_FLAG_MOD_REPLACE: ret = replmd_modify_la_replace(module, replmd_private, schema, msg, el, old_el, @@ -3166,13 +3167,16 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module, ldb_asprintf_errstring(ldb, "Attribute %s is single valued but more than one value has been supplied", el->name); - return LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; + /* Return codes as found on Windows 2012r2 */ + if (mod_type == LDB_FLAG_MOD_REPLACE) { + return LDB_ERR_CONSTRAINT_VIOLATION; + } else { + return LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; + } } else { el->flags |= LDB_FLAG_INTERNAL_DISABLE_SINGLE_VALUE_CHECK; } - - if (ret != LDB_SUCCESS) { return ret; } |