summaryrefslogtreecommitdiff
path: root/python/samba/provision
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2018-10-10 16:34:52 +0100
committerAndrew Bartlett <abartlet@samba.org>2018-11-14 05:07:15 +0100
commit5b4c664856602e411bf2897e44e5453c7831035f (patch)
treeec1f72f3e78b7bf50c24e428ebaba880fad910e6 /python/samba/provision
parent008b9652cacdfd99e68db9d88f4e0c33eefa87e9 (diff)
downloadsamba-5b4c664856602e411bf2897e44e5453c7831035f.tar.gz
python/samba/provision: PY3 port samba4.dlz_bind9.version
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/provision')
-rw-r--r--python/samba/provision/sambadns.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 7fb42f65d4e..9b245608c63 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -60,7 +60,7 @@ from samba.provision.common import (
)
from samba.samdb import get_default_backend_store
-
+from samba.compat import get_string
def get_domainguid(samdb, domaindn):
res = samdb.search(base=domaindn, scope=ldb.SCOPE_BASE, attrs=["objectGUID"])
@@ -798,12 +798,12 @@ def create_samdb_copy(samdb, logger, paths, names, domainsid, domainguid):
scope=ldb.SCOPE_BASE,
attrs=["partition", "backendStore"])
for tmp in res[0]["partition"]:
- (nc, fname) = tmp.split(':')
+ (nc, fname) = str(tmp).split(':')
partfile[nc.upper()] = fname
backend_store = get_default_backend_store()
if "backendStore" in res[0]:
- backend_store = res[0]["backendStore"][0]
+ backend_store = str(res[0]["backendStore"][0])
# Create empty domain partition
@@ -954,6 +954,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
cwd='.').communicate()[0]
+ bind_info = get_string(bind_info)
bind9_8 = '#'
bind9_9 = '#'
bind9_10 = '#'