From c65de71bc38753320b9fd6f6fe1386244a2ff54a Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Wed, 30 Sep 2015 14:13:22 +0300 Subject: intg: Fix RFC2307bis group member creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix creation of mixed user/group "member" attribute for RFC2307bis group entries in ldap_ent.py. Reviewed-by: Lukáš Slebodník --- src/tests/intg/ldap_ent.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/tests/intg/ldap_ent.py b/src/tests/intg/ldap_ent.py index 4369869e3..f8f2f7fe6 100644 --- a/src/tests/intg/ldap_ent.py +++ b/src/tests/intg/ldap_ent.py @@ -77,20 +77,13 @@ def group_bis(base_dn, cn, gidNumber, member_uids=[], member_gids=[]): ('objectClass', ['top', 'extensibleObject', 'groupOfNames']), ('gidNumber', [gidNumber]) ] - if len(member_uids) > 0: - attr_list.append( - ('member', [ - "uid=" + uid + ",ou=Users," + base_dn for - uid in member_uids - ]) - ) - if len(member_gids) > 0: - attr_list.append( - ('member', [ - "cn=" + gid + ",ou=Groups," + base_dn for - gid in member_gids - ]) - ) + member_list = [] + for uid in member_uids: + member_list.append("uid=" + uid + ",ou=Users," + base_dn) + for gid in member_gids: + member_list.append("cn=" + gid + ",ou=Groups," + base_dn) + if len(member_list) > 0: + attr_list.append(('member', member_list)) return ("cn=" + cn + ",ou=Groups," + base_dn, attr_list) -- cgit