diff options
author | Ralph Boehme <slow@samba.org> | 2018-01-24 19:37:55 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2018-02-09 09:30:21 +0100 |
commit | 973b72286b052ad32d288613d19f0c819a69ce82 (patch) | |
tree | 5ff15640783509fb96c3d36924c763929418c4cf /python/samba | |
parent | 08dcf2e4b847627ed98165d14ce4457512fd3c22 (diff) | |
download | samba-973b72286b052ad32d288613d19f0c819a69ce82.tar.gz |
dbcheck: rename err_duplicate_links arguments
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>
(cherry picked from commit a651cc79d64b9bcc1d5fee9b2ef8800a1579dea1)
Diffstat (limited to 'python/samba')
-rw-r--r-- | python/samba/dbchecker.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index b622ac20163..a73f2b1c7a9 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -722,18 +722,18 @@ 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, attrname, vals): + def err_duplicate_links(self, obj, forward_attr, forward_vals): '''handle a duplicate links value''' - if not self.confirm_all("Remove duplicate links in attribute '%s'" % attrname, 'fix_all_duplicate_links'): - self.report("Not removing duplicate links in attribute '%s'" % attrname) + 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) return m = ldb.Message() 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"], - "Failed to fix duplicate links in attribute '%s'" % attrname): - self.report("Fixed duplicate links in attribute '%s'" % (attrname)) + "Failed to fix duplicate links in attribute '%s'" % forward_attr): + self.report("Fixed duplicate links in attribute '%s'" % (forward_attr)) def err_no_fsmoRoleOwner(self, obj): '''handle a missing fSMORoleOwner''' |