sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

collect_tombstones: Allow links to recycled objects to be deleted

Browse Source 
The reason we choose to provide the string DN is because extended_dn_in
will try to correct the <GUID=...> by searching on it (despite the fact
it does not exist and then failing on a ldb_dn_validate in
objectclass_attrs).

We can now also remove the dangling link test from the knownfail.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12385

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Nov  3 01:46:43 CET 2016 on sn-devel-144
This commit is contained in:
Garming Sam 2016-10-21 15:50:09 +13:00 committed by Andrew Bartlett
parent dba624364c
commit ef7e46d68a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail
View File

@ -306,4 +306,3 @@
^samba4.rpc.echo.*on.*with.object.echo.sinkdata.*nt4_dc
^samba4.rpc.echo.*on.*with.object.echo.addone.*nt4_dc
^samba4.rpc.echo.*on.*ncacn_ip_tcp.*with.object.*nt4_dc
^samba4.blackbox.tombstones-expunge.release-4-5-0-pre1.tombstones_expunge

5
source4/dsdb/kcc/garbage_collect_tombstones.c
View File

@ -193,8 +193,9 @@ static NTSTATUS garbage_collect_tombstones_part(TALLOC_CTX *mem_ctx,
guid_buf_str = GUID_buf_string(&guid, &buf_guid);
guid_search_str = talloc_asprintf(mem_ctx,
"<GUID=%s>",
guid_buf_str);
"<GUID=%s>;%s",
guid_buf_str,
dsdb_dn_get_linearized(mem_ctx, dn));
cleanup_val = data_blob_string_const(guid_search_str);
talloc_free(dn);