From 04eb95a46b069f0238dbd232528fd1fadb745066 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 7 Nov 2016 11:04:03 +1300 Subject: dbcheck: Correct message for orphaned backlinks The backlink name is in attrname, not in link_name Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam BUG: https://bugzilla.samba.org/show_bug.cgi?id=12297 --- python/samba/dbchecker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 4b7c159b1c0..3fcfbc05639 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -651,15 +651,15 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) def err_orphaned_backlink(self, obj, attrname, val, link_name, target_dn): '''handle a orphaned backlink value''' self.report("ERROR: orphaned backlink attribute '%s' in %s for link %s in %s" % (attrname, obj.dn, link_name, target_dn)) - if not self.confirm_all('Remove orphaned backlink %s' % link_name, 'fix_all_orphaned_backlinks'): - self.report("Not removing orphaned backlink %s" % link_name) + if not self.confirm_all('Remove orphaned backlink %s' % attrname, 'fix_all_orphaned_backlinks'): + self.report("Not removing orphaned backlink %s" % attrname) return m = ldb.Message() m.dn = obj.dn m['value'] = ldb.MessageElement(val, ldb.FLAG_MOD_DELETE, attrname) if self.do_modify(m, ["show_recycled:1", "relax:0"], - "Failed to fix orphaned backlink %s" % link_name): - self.report("Fixed orphaned backlink %s" % (link_name)) + "Failed to fix orphaned backlink %s" % attrname): + self.report("Fixed orphaned backlink %s" % (attrname)) def err_no_fsmoRoleOwner(self, obj): '''handle a missing fSMORoleOwner''' -- cgit v1.2.1