Mercurial > kallithea

changeset 5331:7def29f9c9b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ldap: fix fallback for no email in ldap
author Mads Kiilerich <madski@unity3d.com>
date Fri, 31 Jul 2015 15:44:07 +0200
parents 40871e0eb13a
children 3b01d62654b3
files kallithea/lib/auth_modules/auth_ldap.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/auth_modules/auth_ldap.py	Fri Jul 31 15:44:07 2015 +0200
+++ b/kallithea/lib/auth_modules/auth_ldap.py	Fri Jul 31 15:44:07 2015 +0200
@@ -345,7 +345,7 @@
                 'firstname': safe_unicode(get_ldap_attr('attr_firstname') or firstname),
                 'lastname': safe_unicode(get_ldap_attr('attr_lastname') or lastname),
                 'groups': [],
-                'email': get_ldap_attr('attr_email' or email),
+                'email': get_ldap_attr('attr_email') or email,
                 'admin': admin,
                 'active': active,
                 "active_from_extern": None,