Skip to content
Snippets Groups Projects
Verified Commit e7d8e991 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '582-login-timeouts-if-ldapserver-is-unavailable' into release-2.3.2

parents d6175efc 2c4c0083
No related branches found
No related tags found
No related merge requests found
......@@ -24,6 +24,8 @@ Fixed
* Show all years in a 200 year range around the current year in date pickers
* Imprint is now called "Imprint" and not "Impress".
* Logo files weren't uploaded to public namespace.
* Limit LDAP network timeouts to not hang indefinitely on login if LDAP
server is unreachable
Changed
~~~~~~~
......
......@@ -405,6 +405,10 @@ if _settings.get("ldap.uri", None):
PosixGroupType,
)
AUTH_LDAP_GLOBAL_OPTIONS = {
ldap.OPT_NETWORK_TIMEOUT: _settings.get("ldap.network_timeout", 3),
}
# Enable Django's integration to LDAP
AUTHENTICATION_BACKENDS.append("aleksis.core.util.ldap.LDAPBackend")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment