Merge branch 'master' into feature/ldap-flags

aleksis/core/settings.py

@@ -208,7 +208,7 @@ if _settings.get("ldap.uri", None):
     # Mapping of LDAP attributes to Django model fields
     AUTH_LDAP_USER_ATTR_MAP = {
         "first_name": _settings.get("ldap.map.first_name", "givenName"),
-        "last_name": _settings.get("ldap.map.first_name", "sn"),
+        "last_name": _settings.get("ldap.map.last_name", "sn"),
         "email": _settings.get("ldap.map.email", "mail"),
     }