diff options
| author | Noel Power <noel.power@suse.com> | 2018-04-25 18:28:30 +0100 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-04-30 15:43:19 +0200 |
| commit | 13280d3db9fdbbd87c6ed2faa69b24bc7660674d (patch) | |
| tree | f04fb4f98163f7a90f20e5f50effd70206e01459 /python/samba/dbchecker.py | |
| parent | cbd6786c0471782024750b85b6f4fbf42977c81b (diff) | |
| download | samba-13280d3db9fdbbd87c6ed2faa69b24bc7660674d.tar.gz | |
python/samba: bulk conversion of caller to dsdb_Dn 2nd param.
Convert second param to dsdb_Dn to be unicode so py2 & py3 code
will work
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'python/samba/dbchecker.py')
| -rw-r--r-- | python/samba/dbchecker.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index fb968a56481..bdcbc34e011 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -286,7 +286,7 @@ class dbcheck(object): listwko = [] proposed_objectguid = None for o in wko: - dsdb_dn = dsdb_Dn(self.samdb, o, dsdb.DSDB_SYNTAX_BINARY_DN) + dsdb_dn = dsdb_Dn(self.samdb, o.decode('utf8'), dsdb.DSDB_SYNTAX_BINARY_DN) if self.is_deleted_objects_dn(dsdb_dn): self.report("wellKnownObjects had duplicate Deleted Objects value %s" % o) # We really want to put this back in the same spot @@ -917,7 +917,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) controls=["show_deleted:0", "extended_dn:0", "reveal_internals:0"]) syntax_oid = self.samdb_schema.get_syntax_oid_from_lDAPDisplayName(attrname) for val in res[0][attrname]: - dsdb_dn = dsdb_Dn(self.samdb, val, syntax_oid) + dsdb_dn = dsdb_Dn(self.samdb, val.decode('utf8'), syntax_oid) guid2 = dsdb_dn.dn.get_extended_component("GUID") if guid == guid2: return dsdb_dn @@ -943,7 +943,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.duplicate_link_cache[duplicate_cache_key] = False for val in obj[forward_attr]: - dsdb_dn = dsdb_Dn(self.samdb, val, forward_syntax) + dsdb_dn = dsdb_Dn(self.samdb, val.decode('utf8'), forward_syntax) # all DNs should have a GUID component guid = dsdb_dn.dn.get_extended_component("GUID") @@ -1178,7 +1178,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) obj[attrname] = ldb.MessageElement(vals, 0, attrname) for val in obj[attrname]: - dsdb_dn = dsdb_Dn(self.samdb, val, syntax_oid) + dsdb_dn = dsdb_Dn(self.samdb, val.decode('utf8'), syntax_oid) # all DNs should have a GUID component guid = dsdb_dn.dn.get_extended_component("GUID") @@ -1312,7 +1312,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) match_count = 0 if reverse_link_name in res[0]: for v in res[0][reverse_link_name]: - v_dn = dsdb_Dn(self.samdb, v) + v_dn = dsdb_Dn(self.samdb, v.decode('utf8')) v_guid = v_dn.dn.get_extended_component("GUID") v_blob = v_dn.dn.get_extended_component("RMD_FLAGS") v_rmd_flags = 0 @@ -1329,7 +1329,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) # Forward binary multi-valued linked attribute forward_count = 0 for w in obj[attrname]: - w_guid = dsdb_Dn(self.samdb, w).dn.get_extended_component("GUID") + w_guid = dsdb_Dn(self.samdb, w.decode('utf8')).dn.get_extended_component("GUID") if w_guid == guid: forward_count += 1 @@ -1337,7 +1337,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) continue expected_count = 0 for v in obj[attrname]: - v_dn = dsdb_Dn(self.samdb, v) + v_dn = dsdb_Dn(self.samdb, v.decode('utf8')) v_guid = v_dn.dn.get_extended_component("GUID") v_blob = v_dn.dn.get_extended_component("RMD_FLAGS") v_rmd_flags = 0 |