diff options
| author | Noel Power <noel.power@suse.com> | 2018-05-04 15:29:59 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-05-12 21:38:17 +0200 |
| commit | c50ccc714a1871ef6eaa3bfc9b16c232127d3fad (patch) | |
| tree | 4e206a61d8aaed397de0185a94d1dd5243e990ca /python/samba/join.py | |
| parent | 6f30a0b5f11b58ab0bb528c7387099171703de4c (diff) | |
| download | samba-c50ccc714a1871ef6eaa3bfc9b16c232127d3fad.tar.gz | |
python/samba: py2/py3 compatability always decode result of b64encode
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/join.py')
| -rw-r--r-- | python/samba/join.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/samba/join.py b/python/samba/join.py index b35eb78e1c6..e164d9b5cf2 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -742,7 +742,7 @@ class dc_join(object): {"DNSDOMAIN": ctx.dnsdomain, "DOMAINDN": ctx.base_dn, "HOSTNAME" : ctx.myname, - "DNSPASS_B64": b64encode(ctx.dnspass.encode('utf-16-le')), + "DNSPASS_B64": b64encode(ctx.dnspass.encode('utf-16-le')).decode('utf8'), "DNSNAME" : ctx.dnshostname})) for changetype, msg in recs: assert changetype == ldb.CHANGETYPE_NONE |