Drop memberUid support; all groups use uniqueMember now

This commit is contained in:
David Bartley 2008-04-01 21:30:58 -04:00
parent 0cade22049
commit 8e4f11b47b
1 changed files with 4 additions and 10 deletions

View File

@ -504,16 +504,10 @@ def group_members(group):
group = ldapi.lookup(ld, 'cn', group, cfg['groups_base']) group = ldapi.lookup(ld, 'cn', group, cfg['groups_base'])
if group: if group and 'uniqueMember' in group:
if 'uniqueMember' in group: r = re.compile('^uid=([^,]*)')
r = re.compile('^uid=([^,]*)') return map(lambda x: r.match(x).group(1), group['uniqueMember'])
return map(lambda x: r.match(x).group(1), group['uniqueMember']) return []
elif 'memberUid' in group:
return group['memberUid']
else:
return []
else:
return []
def expired_accounts(): def expired_accounts():
members = ldapi.search(ld, cfg['users_base'], members = ldapi.search(ld, cfg['users_base'],