diff options
| author | Dominik George <nik@naturalnet.de> | 2014-08-04 23:45:44 +0400 |
|---|---|---|
| committer | Dominik George <nik@naturalnet.de> | 2014-08-04 23:45:44 +0400 |
| commit | 700ebecc03313c4cdb2bb28503519b55878e724b (patch) | |
| tree | 81cee10927957f896e830b6f3678c12f9f699e2c | |
| parent | b90fc0b2b2c42c021f8bfc58cd0e548e7f95f31f (diff) | |
Fix the last commit
| -rw-r--r-- | Authenticators/LDAP/LDAPauth.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Authenticators/LDAP/LDAPauth.py b/Authenticators/LDAP/LDAPauth.py index 2be0166..79b4b39 100644 --- a/Authenticators/LDAP/LDAPauth.py +++ b/Authenticators/LDAP/LDAPauth.py @@ -552,7 +552,7 @@ def do_main_program(): else: ldap_conn.simple_bind_s() - name = self.idToName(id) + name = self.idToName(id, current) res = ldap_conn.search_s(cfg.ldap.users_dn, ldap.SCOPE_SUBTREE, @@ -566,11 +566,12 @@ def do_main_program(): info = {} if cfg.ldap.mail_attr in res[0][1]: - info['UserEmail'] = res[0][1][cfg.ldap.mail_attr][0] + info[Murmur.UserInfo.UserEmail] = res[0][1][cfg.ldap.mail_attr][0] - debug('nameToId %s -> %s', name, repr(info)) + debug('getInfo %s -> %s', name, repr(info)) + return (True, info) else: - debug('nameToId %s -> ?', name) + debug('getInfo %s -> ?', name) return (False, None) |