sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

dbcheck: rename err_duplicate_links arguments

Browse Source 
In preperation of adding more arguments.

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>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Ralph Boehme 2018-01-24 19:37:55 +01:00 committed by Stefan Metzmacher
parent 9f47fe6c4a
commit a651cc79d6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/dbchecker.py
View File

@ -722,18 +722,18 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
"Failed to fix orphaned backlink %s" % backlink_attr): "Failed to fix orphaned backlink %s" % backlink_attr):
self.report("Fixed orphaned backlink %s" % (backlink_attr)) self.report("Fixed orphaned backlink %s" % (backlink_attr))
def err_duplicate_links(self, obj, attrname, vals): def err_duplicate_links(self, obj, forward_attr, forward_vals):
'''handle a duplicate links value''' '''handle a duplicate links value'''
if not self.confirm_all("Remove duplicate links in attribute '%s'" % attrname, 'fix_all_duplicate_links'): 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'" % attrname) self.report("Not removing duplicate links in attribute '%s'" % forward_attr)
return return
m = ldb.Message() m = ldb.Message()
m.dn = obj.dn m.dn = obj.dn
m['value'] = ldb.MessageElement(vals, ldb.FLAG_MOD_REPLACE, attrname) m['value'] = ldb.MessageElement(forward_vals, ldb.FLAG_MOD_REPLACE, forward_attr)
if self.do_modify(m, ["local_oid:1.3.6.1.4.1.7165.4.3.19.2:1"], if self.do_modify(m, ["local_oid:1.3.6.1.4.1.7165.4.3.19.2:1"],
"Failed to fix duplicate links in attribute '%s'" % attrname): "Failed to fix duplicate links in attribute '%s'" % forward_attr):
self.report("Fixed duplicate links in attribute '%s'" % (attrname)) self.report("Fixed duplicate links in attribute '%s'" % (forward_attr))
def err_no_fsmoRoleOwner(self, obj): def err_no_fsmoRoleOwner(self, obj):
'''handle a missing fSMORoleOwner''' '''handle a missing fSMORoleOwner'''