From: Noel Power <noel.power@suse.com>
Date: Fri, 4 May 2018 14:25:22 +0000 (+0100)
Subject: s4/scripting/bin: py2/py3 compatability always decode result of b64encode
X-Git-Tag: ldb-1.4.0~253
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff1920fb6704a617d03d2a18905a4fb603a351bc;p=thirdparty%2Fsamba.git

s4/scripting/bin: py2/py3 compatability always decode result of b64encode

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

diff --git a/source4/scripting/bin/fullschema b/source4/scripting/bin/fullschema
index 2987136a40d..ab0e4e320bd 100755
--- a/source4/scripting/bin/fullschema
+++ b/source4/scripting/bin/fullschema
@@ -147,7 +147,7 @@ def write_ldif_one(o, attrs):
             value = fix_dn(j)
             if a != "cn":
                 if a == "oMObjectClass":
-                    print "%s:: %s" % (a, base64.b64encode(value))
+                    print "%s:: %s" % (a, base64.b64encode(value)).decode('utf8')
                 elif a.endswith("GUID"):
                     print "%s: %s" % (a, ldb.schema_format_value(a, value))
                 else:
diff --git a/source4/scripting/bin/get-descriptors b/source4/scripting/bin/get-descriptors
index 73295b0c383..f1a919c3748 100755
--- a/source4/scripting/bin/get-descriptors
+++ b/source4/scripting/bin/get-descriptors
@@ -85,7 +85,7 @@ class DescrGetter:
         ldif_entry = ["dn: " + dn,
                       "changetype: modify",
                       "replace: nTSecurityDescriptor",
-                      "nTSecurityDescriptor::  " + base64.b64encode(ndr_pack(descr))]
+                      "nTSecurityDescriptor::  " + base64.b64encode(ndr_pack(descr)).decode('utf8')]
 
         for line in ldif_entry:
             length = 79
diff --git a/source4/scripting/bin/minschema b/source4/scripting/bin/minschema
index 8ec559a4584..176ad5c93b9 100755
--- a/source4/scripting/bin/minschema
+++ b/source4/scripting/bin/minschema
@@ -200,7 +200,7 @@ def write_ldif_one(o, attrs):
         for j in v:
 			value = fix_dn(j)
 			if a == "oMObjectClass":
-				print "%s:: %s" % (a, base64.b64encode(value))
+				print "%s:: %s" % (a, base64.b64encode(value).decode('utf8'))
 			elif a.endswith("GUID"):
 				print "%s: %s" % (a, ldb.schema_format_value(a, value))
 			else:
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index db15b65e1dc..e29ba7092b5 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -469,7 +469,7 @@ if __name__ == '__main__':
             setup_add_ldif(ldbs.sam, setup_path("provision_dns_add_samba.ldif"), {
                     "DNSDOMAIN": dnsdomain,
                     "DOMAINDN": domaindn,
-                    "DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')),
+                    "DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')).decode('utf8'),
                     "HOSTNAME" : hostname,
                     "DNSNAME" : dnsname }
                            )
diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index 62b7001f565..9d3e73604a2 100755
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -1067,7 +1067,7 @@ def reload_full_schema(samdb, names):
         schema_ldif += samdb.write_ldif(ent, ldb.CHANGETYPE_NONE)
 
     prefixmap_data = open(setup_path("prefixMap.txt"), 'r').read()
-    prefixmap_data = b64encode(prefixmap_data)
+    prefixmap_data = b64encode(prefixmap_data).decode('utf8')
 
     # We don't actually add this ldif, just parse it
     prefixmap_ldif = "dn: %s\nprefixMap:: %s\n\n" % (schemadn, prefixmap_data)