summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2018-11-14 16:29:07 +0000
committerNoel Power <npower@samba.org>2018-12-10 10:38:22 +0100
commit0cafa9bf943c3980ffe10b1fa0bb325bb36a6fad (patch)
tree6ae08146cc32829416e7fe8ea8d57fe5575301ee /python
parent750540fd5c2ca0a033373d637531a283a2be6ae6 (diff)
downloadsamba-0cafa9bf943c3980ffe10b1fa0bb325bb36a6fad.tar.gz
python/samba: PY3 fix failing py3 samba.tests.group_audit test
Fix bytes being compared against ldb.bytes Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r--python/samba/samdb.py6
1 files changed, 3 insertions, 3 deletions
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