From: Noel Power <noel.power@suse.com>
Date: Mon, 8 Oct 2018 11:27:56 +0000 (+0100)
Subject: python/samba/netcmd: PY3 Fix error in samba4.blackbox.schemaupgrade
X-Git-Tag: tdb-1.3.17~1229
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7562a5518fe8ea49991ca0af8b977f7b9940d014;p=thirdparty%2Fsamba.git

python/samba/netcmd: PY3 Fix error in samba4.blackbox.schemaupgrade

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

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 2278fb5f318..6d8446b72d1 100644
--- 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