python/samba: PY3 ord needs 'str' type not int

string_to_byte_array returns not a bytearray (as the name suggests)
but a list of byte values (int). Some code expects the list so even
using a 'real' bytearray wont work.

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

diff --git a/python/samba/__init__.py b/python/samba/__init__.py
index 291ef541189891d55dd3fe9ff86a001ee9f738a6..93240dddfbb6af0eb91b14d8c46b5f8490d765f8 100644 (file)
--- a/python/samba/__init__.py
+++ b/python/samba/__init__.py
@@ -376,7 +376,7 @@ def string_to_byte_array(string):
     blob = [0] * len(string)
 
     for i in range(len(string)):
-        blob[i] = ord(string[i])
+        blob[i] = string[i] if isinstance(string[i], int) else ord(string[i])
 
     return blob
 

diff --git a/python/samba/tests/auth_log_samlogon.py b/python/samba/tests/auth_log_samlogon.py
index d3b14f3d69e75a9f399ad9a7bec395ae6417dc2d..892ad5166197e12e2d552372813045508d6c5077 100644 (file)
--- a/python/samba/tests/auth_log_samlogon.py
+++ b/python/samba/tests/auth_log_samlogon.py
@@ -124,10 +124,10 @@ class AuthLogTestsSamLogon(samba.tests.auth_log_base.AuthLogTestBase):
         logon_level = netlogon.NetlogonNetworkTransitiveInformation
         logon = samba.dcerpc.netlogon.netr_NetworkInfo()
 
-        logon.challenge = [ord(x) for x in challenge]
+        logon.challenge = [x if isinstance(x,int) else ord(x) for x in challenge]
         logon.nt = netlogon.netr_ChallengeResponse()
         logon.nt.length = len(response["nt_response"])
-        logon.nt.data = [ord(x) for x in response["nt_response"]]
+        logon.nt.data = [x if isinstance(x,int) else ord(x) for x in response["nt_response"]]
         logon.identity_info = samba.dcerpc.netlogon.netr_IdentityInfo()
         (username, domain) = creds.get_ntlm_username_domain()