diff options
-rw-r--r-- | pynslcd/group.py | 9 | ||||
-rw-r--r-- | pynslcd/passwd.py | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/pynslcd/group.py b/pynslcd/group.py index 6153e2f..554ce8e 100644 --- a/pynslcd/group.py +++ b/pynslcd/group.py @@ -91,7 +91,7 @@ class GroupRequest(common.Request): # actually return the results for name in names: if not common.isvalidname(name): - print '%s: %s: denied by validnames option' % (dn, self.attmap['cn']) + print '%s: %s: denied by validnames option' % (dn, attmap['cn']) else: for gid in gids: self.fp.write_int32(constants.NSLCD_RESULT_BEGIN) @@ -124,13 +124,6 @@ class GroupByMemberRequest(GroupRequest): action = constants.NSLCD_ACTION_GROUP_BYMEMBER wantmembers = False - def __init__(self, *args, **kwargs): - super(GroupByMemberRequest, self).__init__(*args, **kwargs) - # set up our own attributes that leave out membership attributes - self.attmap = common.Attributes(attmap) - del self.attmap['memberUid'] - del self.attmap['member'] - def read_parameters(self, fp): memberuid = fp.read_string() common.validate_name(memberuid) diff --git a/pynslcd/passwd.py b/pynslcd/passwd.py index 17ffe34..fff752e 100644 --- a/pynslcd/passwd.py +++ b/pynslcd/passwd.py @@ -61,7 +61,7 @@ class PasswdRequest(common.Request): # write results for name in names: if not common.isvalidname(name): - print '%s: %s: denied by validnames option' % (dn, self.attmap['uid']) + print '%s: %s: denied by validnames option' % (dn, attmap['uid']) else: for uid in uids: self.fp.write_int32(constants.NSLCD_RESULT_BEGIN) |