From 628d09afe079394ef0df136c9c78fe476e3a6562 Mon Sep 17 00:00:00 2001 From: Jake Moshenko Date: Tue, 13 May 2014 15:52:20 -0400 Subject: [PATCH] Remove the passwd attr ldap config. --- data/users.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/data/users.py b/data/users.py index 7cb83a619..65fbff0d1 100644 --- a/data/users.py +++ b/data/users.py @@ -33,15 +33,13 @@ class LDAPConnection(object): class LDAPUsers(object): - def __init__(self, ldap_uri, base_dn, admin_dn, admin_passwd, user_rdn, uid_attr, email_attr, - passwd_attr): + def __init__(self, ldap_uri, base_dn, admin_dn, admin_passwd, user_rdn, uid_attr, email_attr): self._ldap_conn = LDAPConnection(ldap_uri, admin_dn, admin_passwd) self._ldap_uri = ldap_uri self._base_dn = base_dn self._user_rdn = user_rdn self._uid_attr = uid_attr self._email_attr = email_attr - self._passwd_attr = passwd_attr def _ldap_user_search(self, username_or_email): with self._ldap_conn as conn: @@ -131,10 +129,8 @@ class UserAuthentication(object): user_rdn = app.config.get('LDAP_USER_RDN', []) uid_attr = app.config.get('LDAP_UID_ATTR', 'uid') email_attr = app.config.get('LDAP_EMAIL_ATTR', 'mail') - passwd_attr = app.config.get('LDAP_PASSWD_ATTR', 'userPassword') - users = LDAPUsers(ldap_uri, base_dn, admin_dn, admin_passwd, user_rdn, uid_attr, email_attr, - passwd_attr) + users = LDAPUsers(ldap_uri, base_dn, admin_dn, admin_passwd, user_rdn, uid_attr, email_attr) else: raise RuntimeError('Unknown authentication type: %s' % authentication_type)