sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

python/samba: PY3 fix failing py3 samba.tests.group_audit test

Browse Source 
Fix bytes being compared against ldb.bytes

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-11-14 16:29:07 +00:00 committed by Noel Power
parent 750540fd5c
commit 0cafa9bf94
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/samba/samdb.py
View File

@ -34,6 +34,7 @@ from samba.dcerpc import drsblobs, misc
from samba.common import normalise_int32 from samba.common import normalise_int32
from samba.compat import text_type from samba.compat import text_type
from samba.compat import binary_type from samba.compat import binary_type
from samba.compat import get_bytes
from samba.dcerpc import security from samba.dcerpc import security
__docformat__ = "restructuredText" __docformat__ = "restructuredText"
@ -303,14 +304,13 @@ changetype: modify
if len(targetmember) != 1: if len(targetmember) != 1:
raise Exception('Unable to find "%s". Operation cancelled.' % member) raise Exception('Unable to find "%s". Operation cancelled.' % member)
targetmember_dn = targetmember[0].dn.extended_str(1) targetmember_dn = targetmember[0].dn.extended_str(1)
if add_members_operation is True and (targetgroup[0].get('member') is None or get_bytes(targetmember_dn) not in [str(x) for x in targetgroup[0]['member']]):
if add_members_operation is True and (targetgroup[0].get('member') is None or str(targetmember_dn) not in targetgroup[0]['member']):
modified = True modified = True
addtargettogroup += """add: member addtargettogroup += """add: member
member: %s member: %s
""" % (str(targetmember_dn)) """ % (str(targetmember_dn))
elif add_members_operation is False and (targetgroup[0].get('member') is not None and targetmember_dn in targetgroup[0]['member']): elif add_members_operation is False and (targetgroup[0].get('member') is not None and get_bytes(targetmember_dn) in targetgroup[0]['member']):
modified = True modified = True
addtargettogroup += """delete: member addtargettogroup += """delete: member
member: %s member: %s