From 8e4f11b47b05b1745ace79ac1977f72643c01347 Mon Sep 17 00:00:00 2001 From: David Bartley Date: Tue, 1 Apr 2008 21:30:58 -0400 Subject: [PATCH] Drop memberUid support; all groups use uniqueMember now --- ceo/members.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ceo/members.py b/ceo/members.py index ed00847..d5bbe28 100644 --- a/ceo/members.py +++ b/ceo/members.py @@ -504,16 +504,10 @@ def group_members(group): group = ldapi.lookup(ld, 'cn', group, cfg['groups_base']) - if group: - if 'uniqueMember' in group: - r = re.compile('^uid=([^,]*)') - return map(lambda x: r.match(x).group(1), group['uniqueMember']) - elif 'memberUid' in group: - return group['memberUid'] - else: - return [] - else: - return [] + if group and 'uniqueMember' in group: + r = re.compile('^uid=([^,]*)') + return map(lambda x: r.match(x).group(1), group['uniqueMember']) + return [] def expired_accounts(): members = ldapi.search(ld, cfg['users_base'],