sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s4/scripting/bin: PY3 fix samba4.blackbox.upgradeprovision.alpha13

Browse Source
This commit is contained in:
Noel Power 2018-10-03 15:19:09 +01:00 committed by Andrew Bartlett
parent 1a4e95da2b
commit c377bcd487
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/samba/provision/__init__.py
View File

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