Revert "TODO... s4:scripting/python: add support for utf-8 passwords from the command...

This reverts commit abf0e65752eadc6ff872bd58e504811302043598.

diff --git a/python/samba/__init__.py b/python/samba/__init__.py
index db7f115c337ee9e7b4bb0f1305cdd8d741aaf7a6..7cfbc4c10889f5cca8663c1630fd5dc4d35ee6c3 100644 (file)
--- a/python/samba/__init__.py
+++ b/python/samba/__init__.py
@@ -395,10 +395,7 @@ unix2nttime = _glue.unix2nttime
 nttime2string = _glue.nttime2string
 nttime2unix = _glue.nttime2unix
 unix2nttime = _glue.unix2nttime
+generate_random_password = _glue.generate_random_password
 strcasecmp_m = _glue.strcasecmp_m
 strstr_m = _glue.strstr_m
 is_ntvfs_fileserver_built = _glue.is_ntvfs_fileserver_built
-
-def generate_random_password(min_len, max_len):
-    string =  _glue.generate_random_password(min_len, max_len)
-    return unicode(string, 'utf-8')

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 637fc0c9b5fae4a9183ca8fa5d21b55e0e177fc7..b36a7d2a7c9cd525cae2551f4c273426d52104a0 100644 (file)
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -876,7 +876,7 @@ def secretsdb_self_join(secretsdb, domain,
         msg["msDS-KeyVersionNumber"] = [str(key_version_number)]
         msg["privateKeytab"] = ["secrets.keytab"]
 
-    msg["secret"] = [machinepass.encode('utf-8')]
+    msg["secret"] = [machinepass]
     msg["samAccountName"] = ["%s$" % netbiosname]
     msg["secureChannelType"] = [str(secure_channel_type)]
     if domainsid is not None:
@@ -1778,16 +1778,10 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
 
     if krbtgtpass is None:
         krbtgtpass = samba.generate_random_password(128, 255)
-    else:
-        krbtgtpass = unicode(krbtgtpass, 'utf-8')
     if machinepass is None:
         machinepass  = samba.generate_random_password(128, 255)
-    else:
-        machinepass = unicode(machinepass, 'utf-8')
     if dnspass is None:
         dnspass = samba.generate_random_password(128, 255)
-    else:
-        dnspass = unicode(dnspass, 'utf-8')
 
     samdb = fill_samdb(samdb, lp, names, logger=logger,
                    schema=schema,

diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
index 98fb14f5366b49553c0bc9a4deb6b358e3aff82e..9b2c1c233aaa004897f9e5139baa1715ab0523b3 100644 (file)
--- a/python/samba/upgradehelpers.py
+++ b/python/samba/upgradehelpers.py
@@ -628,7 +628,7 @@ def update_dns_account_password(samdb, secrets_ldb, names):
         kvno = str(res[0]["msDs-keyVersionNumber"])
 
         msg = ldb.Message(secrets_msg[0].dn)
-        msg["secret"] = ldb.MessageElement(machinepass.encode('utf-8'),
+        msg["secret"] = ldb.MessageElement(machinepass,
                                                 ldb.FLAG_MOD_REPLACE,
                                                 "secret")
         msg["msDS-KeyVersionNumber"] = ldb.MessageElement(kvno,