From: Noel Power Date: Wed, 14 Nov 2018 16:29:07 +0000 (+0000) Subject: python/samba: PY3 fix failing py3 samba.tests.group_audit test X-Git-Tag: tdb-1.3.17~446 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cafa9bf943c3980ffe10b1fa0bb325bb36a6fad;p=thirdparty%2Fsamba.git python/samba: PY3 fix failing py3 samba.tests.group_audit test Fix bytes being compared against ldb.bytes Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/samdb.py b/python/samba/samdb.py index 1160740a23b..308b5f96a7b 100644 --- a/python/samba/samdb.py +++ b/python/samba/samdb.py @@ -34,6 +34,7 @@ from samba.dcerpc import drsblobs, misc from samba.common import normalise_int32 from samba.compat import text_type from samba.compat import binary_type +from samba.compat import get_bytes from samba.dcerpc import security __docformat__ = "restructuredText" @@ -303,14 +304,13 @@ changetype: modify if len(targetmember) != 1: raise Exception('Unable to find "%s". Operation cancelled.' % member) targetmember_dn = targetmember[0].dn.extended_str(1) - - if add_members_operation is True and (targetgroup[0].get('member') is None or str(targetmember_dn) not in targetgroup[0]['member']): + 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']]): modified = True addtargettogroup += """add: member member: %s """ % (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 addtargettogroup += """delete: member member: %s