From: Ralph Boehme Date: Thu, 25 Jan 2018 13:36:52 +0000 (+0100) Subject: dbcheck: rename err_duplicate_links() to err_recover_forward_links() and adjust the... X-Git-Tag: tevent-0.9.36~236 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec433f8531a822dd40b343fbf3244157a5ecd544;p=thirdparty%2Fsamba.git dbcheck: rename err_duplicate_links() to err_recover_forward_links() and adjust the output message It's really a fatal error to have duplicate values as it's very likely that some forward links got lost. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13228 Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Ralph Boehme Signed-off-by: Stefan Metzmacher --- diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 1ab3eb0356e..308e4bf0a76 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -65,7 +65,7 @@ class dbcheck(object): self.fix_undead_linked_attributes = False self.fix_all_missing_backlinks = False self.fix_all_orphaned_backlinks = False - self.fix_all_duplicate_links = False + self.recover_all_forward_links = False self.fix_rmd_flags = False self.fix_ntsecuritydescriptor = False self.fix_ntsecuritydescriptor_owner_group = False @@ -722,11 +722,14 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) "Failed to fix orphaned backlink %s" % backlink_attr): self.report("Fixed orphaned backlink %s" % (backlink_attr)) - def err_duplicate_links(self, obj, forward_attr, forward_vals): + def err_recover_forward_links(self, obj, forward_attr, forward_vals): '''handle a duplicate links value''' - if not self.confirm_all("Remove duplicate links in attribute '%s'" % forward_attr, 'fix_all_duplicate_links'): - self.report("Not removing duplicate links in attribute '%s'" % forward_attr) + self.report("RECHECK: 'Duplicate/Correct link' lines above for attribute '%s' in '%s'" % (forward_attr, obj.dn)) + + if not self.confirm_all("Commit fixes for (duplicate) forward links in attribute '%s'" % forward_attr, 'recover_all_forward_links'): + self.report("Not fixing corrupted (duplicate) forward links in attribute '%s' of '%s'" % ( + forward_attr, obj.dn)) return m = ldb.Message() m.dn = obj.dn @@ -963,7 +966,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) for keystr in unique_list: dsdb_dn = unique_dict[keystr] vals.append(str(dsdb_dn)) - self.err_duplicate_links(obj, attrname, vals) + self.err_recover_forward_links(obj, attrname, vals) # We should continue with the fixed values obj[attrname] = ldb.MessageElement(vals, ldb.FLAG_MOD_REPLACE, attrname) diff --git a/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output_duplicate_member.txt b/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output_duplicate_member.txt index cacddd22854..61990e6b9b9 100644 --- a/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output_duplicate_member.txt +++ b/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output_duplicate_member.txt @@ -3,6 +3,7 @@ WARNING: Link (back) mismatch for 'memberOf' (1) on 'CN=Administrator,CN=Users,D ERROR: Duplicate forward link values for attribute 'member' in 'CN=Enterprise Admins,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' Duplicate link ';;;;;;;;;CN=Administrator,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' Correct link ';;;;;;;;;CN=Administrator,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' -Remove duplicate links in attribute 'member' [YES] +RECHECK: 'Duplicate/Correct link' lines above for attribute 'member' in 'CN=Enterprise Admins,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' +Commit fixes for (duplicate) forward links in attribute 'member' [YES] Fixed duplicate links in attribute 'member' Checked 225 objects (1 errors)