summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2016-11-07 11:04:03 +1300
committerKarolin Seeger <kseeger@samba.org>2016-11-30 12:19:33 +0100
commitb37023877b50031ad20153947c40c5e3c2d31837 (patch)
tree7883f70aed5273e98555913e7b25981ee1fcc0a2
parent48d45ef07c369a5de400e83f256be96b2e75e54c (diff)
downloadsamba-b37023877b50031ad20153947c40c5e3c2d31837.tar.gz
dbcheck: Correct message for orphaned backlinks
The backlink name is in attrname, not in link_name Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> BUG: https://bugzilla.samba.org/show_bug.cgi?id=12297 (cherry picked from commit 04eb95a46b069f0238dbd232528fd1fadb745066)
-rw-r--r--python/samba/dbchecker.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index 972efbbb3f7..ef54174d2ae 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -627,15 +627,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'''