# HG changeset patch
# User "Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>
# Date 1303819380 -7200
# Node ID f56533aa1caad7685fa5f8e311c4f5132f168e88
# Parent  d6524f3025e80e7692b2c0101a1f43c3c7cf64cf# Parent  a781d315191cf933bac74f9de4ab9fb487089726
Automated merge with https://rhodecode.org/rhodecode

diff -r d6524f3025e8 -r f56533aa1caa rhodecode/lib/auth.py
--- a/rhodecode/lib/auth.py	Sun Apr 24 23:20:58 2011 +0200
+++ b/rhodecode/lib/auth.py	Tue Apr 26 14:03:00 2011 +0200
@@ -205,12 +205,12 @@
                 log.debug('Got ldap DN response %s', user_dn)
 
                 user_attrs = {
-                    'name': ldap_attrs[ldap_settings\
-                                       .get('ldap_attr_firstname')][0],
-                    'lastname': ldap_attrs[ldap_settings\
-                                           .get('ldap_attr_lastname')][0],
-                    'email': ldap_attrs[ldap_settings\
-                                        .get('ldap_attr_email')][0],
+                    'name': ldap_attrs.get(ldap_settings\
+                                       .get('ldap_attr_firstname'), [''])[0],
+                    'lastname': ldap_attrs.get(ldap_settings\
+                                           .get('ldap_attr_lastname'),[''])[0],
+                    'email': ldap_attrs.get(ldap_settings\
+                                        .get('ldap_attr_email'), [''])[0],
                     }
 
                 if user_model.create_ldap(username, password, user_dn,
diff -r d6524f3025e8 -r f56533aa1caa rhodecode/lib/auth_ldap.py
--- a/rhodecode/lib/auth_ldap.py	Sun Apr 24 23:20:58 2011 +0200
+++ b/rhodecode/lib/auth_ldap.py	Tue Apr 26 14:03:00 2011 +0200
@@ -105,9 +105,10 @@
             if not lobjects:
                 raise ldap.NO_SUCH_OBJECT()
 
-            for (dn, attrs) in lobjects:
+            for (dn, _attrs) in lobjects:
                 try:
                     server.simple_bind_s(dn, password)
+                    attrs = server.search_ext_s(dn, ldap.SCOPE_BASE, '(objectClass=*)')[0][1]
                     break
 
                 except ldap.INVALID_CREDENTIALS, e: