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>

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index fbb9fd88313f75cd628264cfda0d25132f8327d1..1fcd19110c8e57a26d315fa7a7c4777a1a995adf 100644 (file)
--- 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);
                }