From e150697a1edae8e65c2282b7c0a50ee06b55fbb8 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Wed, 31 May 2017 17:40:05 +1200 Subject: [PATCH] replmd: special-case member return value in replmd_add_fix_la() Signed-off-by: Douglas Bagnall Pair-programmed-with: Garming Sam Reviewed-by: Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 288c6689973..e40449452c1 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -947,7 +947,11 @@ static int replmd_add_fix_la(struct ldb_module *module, TALLOC_CTX *mem_ctx, "Linked attribute %s has " "multiple identical values", el->name); talloc_free(tmp_ctx); - return LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; + if (ldb_attr_cmp(el->name, "member") == 0) { + return LDB_ERR_ENTRY_ALREADY_EXISTS; + } else { + return LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; + } } ret = replmd_build_la_val(el->values, p->v, p->dsdb_dn, &ac->our_invocation_id, -- 2.47.2