diff options
Diffstat (limited to 'python/samba/dbchecker.py')
| -rw-r--r-- | python/samba/dbchecker.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 2619b9bc72e..6a44a46c61e 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -1979,8 +1979,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) raise else: instancetype |= dsdb.INSTANCE_TYPE_NC_ABOVE - - if self.write_ncs is not None and str(nc_root) in self.write_ncs: + if self.write_ncs is not None and str(nc_root) in [str(x) for x in self.write_ncs]: instancetype |= dsdb.INSTANCE_TYPE_WRITE return instancetype @@ -2100,10 +2099,10 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.report("ERROR: Not fixing num_values(%d) for '%s' on '%s'" % (len(obj[attrname]), attrname, str(obj.dn))) else: - object_rdn_val = obj[attrname][0] + object_rdn_val = str(obj[attrname][0]) if str(attrname).lower() == 'isdeleted': - if obj[attrname][0] != "FALSE": + if str(obj[attrname][0]) != "FALSE": isDeleted = True if str(attrname).lower() == 'systemflags': @@ -2278,7 +2277,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) if str(attrname).lower() == "instancetype": calculated_instancetype = self.calculate_instancetype(dn) - if len(obj["instanceType"]) != 1 or obj["instanceType"][0] != str(calculated_instancetype): + if len(obj["instanceType"]) != 1 or int(obj["instanceType"][0]) != calculated_instancetype: error_count += 1 self.err_wrong_instancetype(obj, calculated_instancetype) |