diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2012-01-29 14:50:27 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2012-01-29 14:50:27 +0000 |
| commit | 0ddbc4563992e3e27a8e2fd1a343a855af6af151 (patch) | |
| tree | c5398ce27b3d0b4c1252b0096cb39dd24b9ce95b | |
| parent | fcce277a6e8d56036f6a33bda67aa8dcc03be142 (diff) | |
small simplification in group lookups (member attributes are not requested anyway)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1614 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | pynslcd/group.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pynslcd/group.py b/pynslcd/group.py index f5bb2b1..2880a6b 100644 --- a/pynslcd/group.py +++ b/pynslcd/group.py @@ -66,8 +66,6 @@ class Search(common.Search): class GroupRequest(common.Request): - wantmembers = True - def write(self, name, passwd, gid, members): self.fp.write_string(name) self.fp.write_string(passwd) @@ -83,16 +81,15 @@ class GroupRequest(common.Request): gids = [int(x) for x in attributes['gidNumber']] # build member list members = set() - if self.wantmembers: - # add the memberUid values - for member in clean(attributes['memberUid']): - if common.isvalidname(member): - members.add(member) - # 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) + # add the memberUid values + for member in clean(attributes['memberUid']): + if common.isvalidname(member): + members.add(member) + # 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) # actually return the results for name in names: if not common.isvalidname(name): @@ -124,7 +121,6 @@ class GroupByGidRequest(GroupRequest): class GroupByMemberRequest(GroupRequest): action = constants.NSLCD_ACTION_GROUP_BYMEMBER - wantmembers = False def read_parameters(self, fp): memberuid = fp.read_string() |