diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2011-08-03 19:54:53 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2011-08-03 19:54:53 +0000 |
| commit | d76bfc4731e425096679ce248f559de14f75a6bd (patch) | |
| tree | b50b2f08e87bdb4aabd2c3ebc8ac48b0634fb42f /pynslcd/group.py | |
| parent | c85da1930153a849f48b3dca0236610d528f730c (diff) | |
switch to using the member attribute by default instead of uniqueMember
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1484 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'pynslcd/group.py')
| -rw-r--r-- | pynslcd/group.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pynslcd/group.py b/pynslcd/group.py index f4519e2..6fd19d3 100644 --- a/pynslcd/group.py +++ b/pynslcd/group.py @@ -36,7 +36,7 @@ attmap = common.Attributes(cn='cn', userPassword='"*"', gidNumber='gidNumber', memberUid='memberUid', - uniqueMember='uniqueMember') + member='member') filter = '(|(objectClass=posixGroup)(objectClass=groupOfUniqueNames))' @@ -63,8 +63,8 @@ class GroupRequest(common.Request): for member in clean(attributes['memberUid']): if common.isvalidname(member): members.add(member) - # translate and add the uniqueMember values - for memberdn in clean(attributes['uniqueMember']): + # translate and add the member values + for memberdn in clean(attributes['member']): member = dn2uid(self.conn, memberdn) if member and common.isvalidname(member): members.add(member) @@ -109,7 +109,7 @@ class GroupByMemberRequest(GroupRequest): # set up our own attributes that leave out membership attributes self.attmap = common.Attributes(attmap) del self.attmap['memberUid'] - del self.attmap['uniqueMember'] + del self.attmap['member'] def read_parameters(self, fp): memberuid = fp.read_string() @@ -122,12 +122,12 @@ class GroupByMemberRequest(GroupRequest): def mk_filter(self, parameters): # we still need a custom mk_filter because this is an | query memberuid = parameters['memberUid'] - if attmap['uniqueMember']: + if attmap['member']: dn = uid2dn(self.conn, memberuid) if dn: return '(&%s(|(%s=%s)(%s=%s)))' % ( self.filter, attmap['memberUid'], ldap.filter.escape_filter_chars(memberuid), - attmap['uniqueMember'], ldap.filter.escape_filter_chars(dn) ) + attmap['member'], ldap.filter.escape_filter_chars(dn) ) return '(&%s(%s=%s))' % ( self.filter, attmap['memberUid'], ldap.filter.escape_filter_chars(memberuid) ) |