summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolai Kondrashov <Nikolai.Kondrashov@redhat.com>2015-09-30 14:13:22 +0300
committerJakub Hrozek <jhrozek@redhat.com>2015-10-02 09:26:23 +0200
commitbaa92b7f433c69bfe2b2884e2ae0f08e7b7862ee (patch)
treed7269e30ebba70005e7e5f24bd9295707cf08877
parent9f1589b9e11ac79c72d2d55ff120333343967d49 (diff)
downloadsssd-baa92b7f433c69bfe2b2884e2ae0f08e7b7862ee.tar.gz
sssd-baa92b7f433c69bfe2b2884e2ae0f08e7b7862ee.tar.xz
sssd-baa92b7f433c69bfe2b2884e2ae0f08e7b7862ee.zip
intg: Fix RFC2307bis group member creation
Fix creation of mixed user/group "member" attribute for RFC2307bis group entries in ldap_ent.py.
-rw-r--r--src/tests/intg/ldap_ent.py21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/tests/intg/ldap_ent.py b/src/tests/intg/ldap_ent.py
index 0bac514c3..14073490b 100644
--- a/src/tests/intg/ldap_ent.py
+++ b/src/tests/intg/ldap_ent.py
@@ -72,20 +72,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)