# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1438350247 -7200
# Node ID 7def29f9c9b9bbcc8bb0df26d2feb0305f29a422
# Parent  40871e0eb13a511b23d292c58ad0783d2816d931
ldap: fix fallback for no email in ldap

diff -r 40871e0eb13a -r 7def29f9c9b9 kallithea/lib/auth_modules/auth_ldap.py
--- 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,