From 4a24109d5d85461fbf5f4c11f7485d2789134b9b Mon Sep 17 00:00:00 2001 From: Andrej Gessel Date: Thu, 19 Oct 2017 17:16:37 +0200 Subject: [PATCH] repl_meta_data: Fix removing of backlink on deleted objects USER is memberOf GROUP and they both were deleted on W2K8R2 AD. Domain join ends with error below. Failed to apply records: ../source4/dsdb/samdb/ldb_modules/repl_meta_data.c:421 8: Failed to remove backlink of memberOf when deleting CN=USER\0ADEL:a1f2a2cc-1 179-4734-b753-c121ed02a34c,CN=Deleted Objects,DC=samdom,DC=intern: dsdb_module_ search_dn: did not find base dn CN=GROUP\0ADEL:030d0be1-3ada-4b93-8371-927f2092 3116,CN=Deleted Objects,DC=samdom,DC=intern (0 results): Operations error Failed to commit objects: WERR_GEN_FAILURE/NT_STATUS_INVALID_NETWORK_RESPONSE BUG: https://bugzilla.samba.org/show_bug.cgi?id=13120 Signed-off-by: Andrej Gessel Reviewed-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher (cherry picked from commit 40bd7e145a68c9a58d6bc3c5526a12fdf0027729) --- selftest/knownfail.d/delete_member_of_deleted_group | 1 - source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 selftest/knownfail.d/delete_member_of_deleted_group diff --git a/selftest/knownfail.d/delete_member_of_deleted_group b/selftest/knownfail.d/delete_member_of_deleted_group deleted file mode 100644 index f399d33..0000000 --- a/selftest/knownfail.d/delete_member_of_deleted_group +++ /dev/null @@ -1 +0,0 @@ -^samba4\.blackbox\.runtime-links\.release-4-5-0-pre1\.delete_member_of_deleted_group \ No newline at end of file diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 2abbbfd..49128f2 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -3799,7 +3799,8 @@ static int replmd_delete_remove_link(struct ldb_module *module, ret = dsdb_module_search_dn(module, tmp_ctx, &link_res, msg->dn, attrs, DSDB_FLAG_NEXT_MODULE | - DSDB_SEARCH_SHOW_EXTENDED_DN, + DSDB_SEARCH_SHOW_EXTENDED_DN | + DSDB_SEARCH_SHOW_RECYCLED, parent); if (ret != LDB_SUCCESS) { -- 1.9.1