diff options
| author | Ralph Boehme <slow@samba.org> | 2018-01-25 10:52:35 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-02-06 12:07:07 +0100 |
| commit | 1d59b2a3e64c43e9803ca4eef4f4022358827211 (patch) | |
| tree | 7285199737ecd7e969ac167b168d674326932502 /python | |
| parent | 478f51cb1b095c389cae4fdcc76b5923eede6262 (diff) | |
| download | samba-1d59b2a3e64c43e9803ca4eef4f4022358827211.tar.gz | |
dbcheck: add forward_syntax argument to err_orphaned_backlink
Will be used in a subsequent commit.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13228
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 6f77503871fcb815e474cb76d14e22f7a8f083c9)
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/dbchecker.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index b56125d23f2..8a9ee438cf6 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -708,7 +708,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) "Failed to fix incorrect RMD_FLAGS %u" % rmd_flags): self.report("Fixed incorrect RMD_FLAGS %u" % (rmd_flags)) - def err_orphaned_backlink(self, obj, backlink_attr, backlink_val, target_dn, forward_attr): + def err_orphaned_backlink(self, obj, backlink_attr, backlink_val, target_dn, forward_attr, forward_syntax): '''handle a orphaned backlink value''' self.report("ERROR: orphaned backlink attribute '%s' in %s for link %s in %s" % (backlink_attr, obj.dn, forward_attr, target_dn)) if not self.confirm_all('Remove orphaned backlink %s' % backlink_attr, 'fix_all_orphaned_backlinks'): @@ -1148,7 +1148,8 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) error_count += 1 self.err_orphaned_backlink(obj, attrname, val, dsdb_dn.dn, - reverse_link_name) + reverse_link_name, + reverse_syntax_oid) continue # Only warn here and let the forward link logic fix it. self.report("WARNING: Link (back) mismatch for '%s' (%d) on '%s' to '%s' (%d) on '%s'" % ( @@ -1180,7 +1181,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) else: self.err_orphaned_backlink(res[0], reverse_link_name, obj.dn.extended_str(), obj.dn, - attrname) + attrname, syntax_oid) diff_count += 1 |