From c0e4fc7dcdb9b50fa96d13bf4bd12f6430e2f56d Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Fri, 30 Sep 2016 16:19:12 +0200 Subject: [PATCH] ldap: fixed email extraction typo. An empty ldap email will now not overwritt the stored one. --- rhodecode/authentication/plugins/auth_ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py index 7048683d..f97dc583 100644 --- a/rhodecode/authentication/plugins/auth_ldap.py +++ b/rhodecode/authentication/plugins/auth_ldap.py @@ -444,7 +444,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin): 'lastname': safe_unicode( get_ldap_attr('attr_lastname') or lastname), 'groups': 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,