sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

python: Bulk conversion callers of ldb.Dn second param

Browse Source 
Convert second param passed to ldb.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>
This commit is contained in:
Noel Power
2018-04-25 20:01:49 +01:00
committed by Noel Power
parent 13280d3db9
commit b54472f868
12 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/samba/remove_dc.py
View File

@ -230,7 +230,7 @@ def offline_remove_server(samdb, logger,
dc_name = str(msgs[0]["cn"][0])
try:
computer_dn = ldb.Dn(samdb, msgs[0]["serverReference"][0])
computer_dn = ldb.Dn(samdb, msgs[0]["serverReference"][0].decode('utf8'))
except KeyError:
computer_dn = None
@ -295,7 +295,7 @@ def offline_remove_ntds_dc(samdb,
res = samdb.search("",
scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
assert len(res) == 1
my_serviceName = ldb.Dn(samdb, res[0]["dsServiceName"][0])
my_serviceName = ldb.Dn(samdb, res[0]["dsServiceName"][0].decode('utf8'))
server_dn = ntds_dn.parent()
if my_serviceName == ntds_dn: