From: Noel Power <noel.power@suse.com>
Date: Thu, 17 May 2018 12:34:00 +0000 (+0100)
Subject: fallout from py_dsdb_DsReplicaAttribute to -> bytes
X-Git-Tag: tdb-1.3.17~1609
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b30bcf7b71538a7e933453681e13eb407896efc;p=thirdparty%2Fsamba.git

fallout from py_dsdb_DsReplicaAttribute to -> bytes

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/join.py b/python/samba/join.py
index f111dcc8c3b..66a5641a08b 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -49,6 +49,7 @@ import time
 import re
 import os
 import tempfile
+from samba.compat import text_type
 
 
 class DCJoinException(Exception):
@@ -483,6 +484,7 @@ class DCJoinContext(object):
                     v = [rec[a]]
                 else:
                     v = rec[a]
+                v = [x.encode('utf8') if isinstance(x, text_type) else x for x in v]
                 rattr = ctx.tmp_samdb.dsdb_DsReplicaAttribute(ctx.tmp_samdb, a, v)
                 attrs.append(rattr)