refactor some of the attribute mapping code to introduce a mapping instance that does the hard work and support the lower() and upper() attribute mapping functions

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1641 ef36b2f9-881f-0410-afb5-c4e39611909c

1 files changed, 2 insertions, 2 deletions

diff --git a/pynslcd/pam.py b/pynslcd/pam.py
index 8e4f76f..c4d8a3c 100644
--- a/pynslcd/pam.py
+++ b/pynslcd/pam.py
@@ -56,10 +56,10 @@ class PAMRequest(common.Request):
             # save the DN
             parameters['userdn'] = entry[0]
             # get the "real" username
-            value = common.get_rdn_value(entry[0], passwd.attmap['uid'])
+            value = passwd.attmap.get_rdn_value(entry[0], 'uid')
             if not value:
                 # get the username from the uid attribute
-                values = myldap_get_values(entry, passwd.attmap['uid'])
+                values = entry[1]['uid']
                 if not values or not values[0]:
                     logging.warning('%s: is missing a %s attribute', dn, passwd.attmap['uid'])
                 value = values[0]