sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-31 01:48:16 +03:00
Code

python/samba: PY3 port for ridalloc_exop test to work

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit fc13a1268a4a9de94efd312a8309aa55d331ae19)
This commit is contained in:
Noel Power 2018-09-07 12:42:19 +01:00 committed by Karolin Seeger
parent 300d52de7e
commit 19a77a10b7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/samba/dbchecker.py
View File

@ -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)

4
python/samba/remove_dc.py
View File

@ -221,7 +221,7 @@ def offline_remove_server(samdb, logger,
computer_dn = None
try:
dnsHostName = msgs[0]["dnsHostName"][0]
dnsHostName = str(msgs[0]["dnsHostName"][0])
except KeyError:
dnsHostName = None
@ -251,7 +251,7 @@ def offline_remove_server(samdb, logger,
samdb.delete(computer_dn, ["tree_delete:0"])
if "dnsHostName" in msgs[0]:
dnsHostName = msgs[0]["dnsHostName"][0]
dnsHostName = str(msgs[0]["dnsHostName"][0])
if remove_dns_account:
res = samdb.search(expression="(&(objectclass=user)(cn=dns-%s)(servicePrincipalName=DNS/%s))" %