dbcheck: Find and fix a missing Deleted Objects container
authorAndrew Bartlett <abartlet@samba.org>
Thu, 24 Mar 2016 07:12:55 +0000 (20:12 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 6 Jun 2016 06:50:09 +0000 (08:50 +0200)
commitdb15993401f927fd2fcea1687c4155dce2272aa8
tree89f9b586bb3af33123c0e79b0ce4bc2bdb97b452
parente070af22ac7a0fdcb4c275233d0af7bb49c6fb4d
dbcheck: Find and fix a missing Deleted Objects container

Older Samba versions could delete this.  This patch tries very hard
to put back the original object, with the original GUID, so that
if another replica has the correct container, that we just merge
rather than conflict.

The existing "wrong dn" check can then put any deleted objects
under this container correctly.

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Pair-programmed-with: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
python/samba/dbchecker.py
source4/dsdb/samdb/ldb_modules/objectclass.c
source4/selftest/provisions/release-4-1-0rc3/expected-deleted_objects-after-dbcheck.ldif [new file with mode: 0644]
testprogs/blackbox/dbcheck-oldrelease.sh