sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s4/dsdb/tests/python: base64.b64encode returns bytes

Browse Source 
adjust to unicode for py2/py3 compat needed as part of changes
to ensure samba4.ldap.password_settings will work with PY3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Noel Power 2018-05-31 16:13:28 +01:00 committed by Andrew Bartlett
parent 883c3d8d64
commit 2a2c22136b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/dsdb/tests/python/password_settings.py
View File

@ -727,7 +727,7 @@ class PasswordSettingsTestCase(PasswordTestCase):
# defaults, to prove that the DC will reject bad passwords during a
# user add
userdn = "CN=testuser,%s" % self.ou
password = base64.b64encode("\"abcdef\"".encode('utf-16-le'))
password = base64.b64encode('"abcdef"'.encode('utf-16-le')).decode('utf8')
# Note we use an LDIF operation to ensure that the password gets set
# as part of the 'add' operation (whereas self.add_user() adds the user
@ -751,7 +751,7 @@ unicodePwd:: %s
# now use a password that meets the domain defaults, but doesn't meet
# the PSO requirements. Note that Windows allows this, i.e. it doesn't
# honour the PSO during the add operation
password = base64.b64encode("\"abcde12#\"".encode('utf-16-le'))
password = base64.b64encode('"abcde12#"'.encode('utf-16-le')).decode('utf8')
ldif = """
dn: %s
objectClass: user
@ -787,7 +787,7 @@ unicodePwd:: %s
self.assertTrue('0000052D' in msg, msg)
# check setting a password that meets the PSO settings works
password = base64.b64encode("\"abcdefghijkl\"".encode('utf-16-le'))
password = base64.b64encode('"abcdefghijkl"'.encode('utf-16-le')).decode('utf8')
ldif = """
dn: %s
changetype: modify