git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55f5147
)
python/samba/netcmd: PY3 Fix error in samba4.blackbox.schemaupgrade
author
Noel Power
<noel.power@suse.com>
Mon, 8 Oct 2018 11:27:56 +0000
(12:27 +0100)
committer
Andrew Bartlett
<abartlet@samba.org>
Tue, 23 Oct 2018 03:50:28 +0000
(
05:50
+0200)
Getting Exception: must be str, not ldb.bytes error in scheme_upgrade
phase of test
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/netcmd/domain.py
patch
|
blob
|
history
diff --git
a/python/samba/netcmd/domain.py
b/python/samba/netcmd/domain.py
index 2278fb5f318bc4afd22936384845c6476a4ef314..6d8446b72d113a0a2cc1ab5e8ad70fc55e5f7925 100644
(file)
--- a/
python/samba/netcmd/domain.py
+++ b/
python/samba/netcmd/domain.py
@@
-4092,7
+4092,7
@@
class cmd_domain_schema_upgrade(Command):
if len(res) != 1:
ldif_op.unknown_oid = value
else:
- display_name =
res[0]['ldapDisplayName'][0]
+ display_name =
str(res[0]['ldapDisplayName'][0])
line = line.replace(value, ' ' + display_name)
# Microsoft has marked objects as defunct that Samba doesn't know about