nss-pam-ldapd commit: r1576 - nss-pam-ldapd/pynslcd

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Wed Dec 28 22:29:57 2011
New Revision: 1576
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1576&view=revision

Log:
fix references to attmap (broken in r1571)

Modified:
   nss-pam-ldapd/pynslcd/group.py
   nss-pam-ldapd/pynslcd/passwd.py

Modified: nss-pam-ldapd/pynslcd/group.py
==============================================================================
--- nss-pam-ldapd/pynslcd/group.py      Wed Dec 28 18:07:52 2011        (r1575)
+++ nss-pam-ldapd/pynslcd/group.py      Wed Dec 28 22:29:57 2011        (r1576)
@@ -91,7 +91,7 @@
         # 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 @@
     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)

Modified: nss-pam-ldapd/pynslcd/passwd.py
==============================================================================
--- nss-pam-ldapd/pynslcd/passwd.py     Wed Dec 28 18:07:52 2011        (r1575)
+++ nss-pam-ldapd/pynslcd/passwd.py     Wed Dec 28 22:29:57 2011        (r1576)
@@ -61,7 +61,7 @@
         # 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)
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/