From c377bcd487c59555633041624683a3c958897dbc Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 3 Oct 2018 15:19:09 +0100 Subject: [PATCH] s4/scripting/bin: PY3 fix samba4.blackbox.upgradeprovision.alpha13 --- python/samba/provision/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 7fff0d6bc31..9c7a30404ee 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -220,8 +220,8 @@ def find_provision_key_parameters(samdb, secretsdb, idmapdb, paths, smbconf, "configurationNamingContext", "rootDomainNamingContext", "namingContexts"]) - names.configdn = current[0]["configurationNamingContext"][0] - names.schemadn = current[0]["schemaNamingContext"][0] + names.configdn = str(current[0]["configurationNamingContext"][0]) + names.schemadn = str(current[0]["schemaNamingContext"][0]) if not (ldb.Dn(samdb, basedn) == (ldb.Dn(samdb, current[0]["defaultNamingContext"][0].decode('utf8')))): raise ProvisioningError(("basedn in %s (%s) and from %s (%s)" @@ -229,8 +229,8 @@ def find_provision_key_parameters(samdb, secretsdb, idmapdb, paths, smbconf, str(current[0]["defaultNamingContext"][0].decode('utf8')), paths.smbconf, basedn))) - names.domaindn = current[0]["defaultNamingContext"][0] - names.rootdn = current[0]["rootDomainNamingContext"][0] + names.domaindn = str(current[0]["defaultNamingContext"][0]) + names.rootdn = str(current[0]["rootDomainNamingContext"][0]) names.ncs = current[0]["namingContexts"] names.dnsforestdn = None names.dnsdomaindn = None