diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2019-01-16 17:35:48 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-13 04:15:14 +0100 |
| commit | cb502997b377f3aea05635c4c658754f70b34fd6 (patch) | |
| tree | 9d187e927825c90a794daefadc2bd69a2cb5a33e | |
| parent | c874b62556b711082b62451f937f6102abdc3761 (diff) | |
| download | samba-cb502997b377f3aea05635c4c658754f70b34fd6.tar.gz | |
replmd: move a if (ret) closer to ret source
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 9 |
1 files changed, 5 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 fbb9fd88313..1fcd19110c8 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -3371,7 +3371,11 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module, el->flags, el->name); return LDB_ERR_UNWILLING_TO_PERFORM; } - if (dsdb_check_single_valued_link(schema_attr, el) != LDB_SUCCESS) { + if (ret != LDB_SUCCESS) { + return ret; + } + ret = dsdb_check_single_valued_link(schema_attr, el); + if (ret != LDB_SUCCESS) { ldb_asprintf_errstring(ldb, "Attribute %s is single valued but more than one value has been supplied", el->name); @@ -3385,9 +3389,6 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module, el->flags |= LDB_FLAG_INTERNAL_DISABLE_SINGLE_VALUE_CHECK; } - if (ret != LDB_SUCCESS) { - return ret; - } if (old_el) { ldb_msg_remove_attr(old_msg, el->name); } |