PY3: net.change_password & net.set_password take string not 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 e2aa5fdd28ae4270adb482c5ddf4a50ce704c37a..cf5d1b92b66e963c1959a34e8b23913e22478a01 100644 (file)
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -735,7 +735,7 @@ class DCJoinContext(object):
                     pass
                 ctx.net.set_password(account_name=ctx.samname,
                                      domain_name=ctx.domain_name,
-                                     newpassword=ctx.acct_pass.encode('utf-8'))
+                                     newpassword=ctx.acct_pass)
 
             res = ctx.samdb.search(base=ctx.acct_dn, scope=ldb.SCOPE_BASE,
                                    attrs=["msDS-KeyVersionNumber",

diff --git a/python/samba/tests/audit_log_dsdb.py b/python/samba/tests/audit_log_dsdb.py
index 82b93ccfc9c888118fd952dce867a0b4011c3b66..883d27e42e7b31ff5dfaf0e61dfe26f104e5bea5 100644 (file)
--- a/python/samba/tests/audit_log_dsdb.py
+++ b/python/samba/tests/audit_log_dsdb.py
@@ -132,7 +132,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
         net = Net(creds, lp, server=self.server)
         password = "newPassword!!42"
 
-        net.change_password(newpassword=password.encode('utf-8'),
+        net.change_password(newpassword=password,
                             username=USER_NAME,
                             oldpassword=USER_PASS)
 
@@ -175,7 +175,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
         password = "newPassword!!42"
         domain = lp.get("workgroup")
 
-        net.set_password(newpassword=password.encode('utf-8'),
+        net.set_password(newpassword=password,
                          account_name=USER_NAME,
                          domain_name=domain)
         messages = self.waitForMessages(1, net, dn=dn)

diff --git a/python/samba/tests/audit_log_pass_change.py b/python/samba/tests/audit_log_pass_change.py
index a86f650ada0d107aa578e5706c735d0080ec2a1b..dc554acd68a4a1fa18bae034159f7887bbf21e32 100644 (file)
--- a/python/samba/tests/audit_log_pass_change.py
+++ b/python/samba/tests/audit_log_pass_change.py
@@ -109,7 +109,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
         net = Net(creds, lp, server=self.server)
         password = "newPassword!!42"
 
-        net.change_password(newpassword=password.encode('utf-8'),
+        net.change_password(newpassword=password,
                             username=USER_NAME,
                             oldpassword=USER_PASS)
 
@@ -172,7 +172,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
         domain = lp.get("workgroup")
 
         try:
-            net.set_password(newpassword=password.encode('utf-8'),
+            net.set_password(newpassword=password,
                              account_name=USER_NAME,
                              domain_name=domain)
             self.fail("Expected exception not thrown")
@@ -211,7 +211,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
         password = "newPassword!!42"
         domain = lp.get("workgroup")
 
-        net.set_password(newpassword=password.encode('utf-8'),
+        net.set_password(newpassword=password,
                          account_name=USER_NAME,
                          domain_name=domain)
 

diff --git a/python/samba/tests/auth_log_pass_change.py b/python/samba/tests/auth_log_pass_change.py
index 1bbb0ea6b0c32dfb4259244c4321c6bcda14b56a..a6b3868fa045a31b578b344ace15daab58f1341c 100644 (file)
--- a/python/samba/tests/auth_log_pass_change.py
+++ b/python/samba/tests/auth_log_pass_change.py
@@ -89,7 +89,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
         net = Net(creds, lp, server=self.server_ip)
         password = "newPassword!!42"
 
-        net.change_password(newpassword=password.encode('utf-8'),
+        net.change_password(newpassword=password,
                             username=USER_NAME,
                             oldpassword=USER_PASS)
 
@@ -117,7 +117,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
 
         exception_thrown = False
         try:
-            net.change_password(newpassword=password.encode('utf-8'),
+            net.change_password(newpassword=password,
                                 oldpassword=USER_PASS,
                                 username=USER_NAME)
         except Exception:
@@ -148,7 +148,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
 
         exception_thrown = False
         try:
-            net.change_password(newpassword=password.encode('utf-8'),
+            net.change_password(newpassword=password,
                                 oldpassword=USER_PASS,
                                 username="badUser")
         except Exception:
@@ -179,7 +179,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
 
         exception_thrown = False
         try:
-            net.change_password(newpassword=password.encode('utf-8'),
+            net.change_password(newpassword=password,
                                 oldpassword="badPassword",
                                 username=USER_NAME)
         except Exception:

diff --git a/source4/dsdb/tests/python/password_lockout.py b/source4/dsdb/tests/python/password_lockout.py
index bc0613b71b15409b98f4d14bc0a6ffe0d4bee9cd..415f8f7065eeac4773a90b5ef5cd3c0c0811d095 100755 (executable)
--- a/source4/dsdb/tests/python/password_lockout.py
+++ b/source4/dsdb/tests/python/password_lockout.py
@@ -662,7 +662,7 @@ userPassword: thatsAcomplPASS2XYZ
 
         # prove we can change the user password (using the correct password)
         new_password = "thatsAcomplPASS2"
-        net.change_password(newpassword=new_password.encode('utf-8'),
+        net.change_password(newpassword=new_password,
                             username=username,
                             oldpassword=creds.get_password())
         creds.set_password(new_password)
@@ -673,7 +673,7 @@ userPassword: thatsAcomplPASS2XYZ
             badPwdCount = i + 1
             try:
                 print("Trying bad password, attempt #%u" % badPwdCount)
-                net.change_password(newpassword=new_password.encode('utf-8'),
+                net.change_password(newpassword=new_password,
                                     username=creds.get_username(),
                                     oldpassword="bad-password")
                 self.fail("Invalid SAMR change_password accepted")
@@ -707,7 +707,7 @@ userPassword: thatsAcomplPASS2XYZ
         for password in (creds.get_password(), "bad-password"):
             try:
                 print("Trying password %s" % password)
-                net.change_password(newpassword=new_password.encode('utf-8'),
+                net.change_password(newpassword=new_password,
                                     username=creds.get_username(),
                                     oldpassword=password)
                 self.fail("Invalid SAMR change_password accepted")
@@ -740,7 +740,7 @@ userPassword: thatsAcomplPASS2XYZ
                                   msDSUserAccountControlComputed=0)
 
         # check we can change the user password successfully now
-        net.change_password(newpassword=new_password.encode('utf-8'),
+        net.change_password(newpassword=new_password,
                             username=username,
                             oldpassword=creds.get_password())
         creds.set_password(new_password)