Merge pull request #1301 from jumpserver/dev

Dev

Merge pull request #1301 from jumpserver/dev
Dev
5bfc34a9 · 老广 · GitHub · dfd98f8a · 869a8496 · 5bfc34a9
Unverified Commit 5bfc34a9 authored May 08, 2018 by 老广 Committed by GitHub May 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

settings.py apps/jumpserver/settings.py +1 -1

No files found.
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -330,7 +330,7 @@ AUTH_LDAP_GROUP_SEARCH = LDAPSearch(
    AUTH_LDAP_GROUP_SEARCH_OU, ldap.SCOPE_SUBTREE, AUTH_LDAP_GROUP_SEARCH_FILTER
 )
 AUTH_LDAP_CONNECTION_OPTIONS = {
-    ldap.TIMEOUT: 5
+    ldap.OPT_TIMEOUT: 5
 }
 AUTH_LDAP_ALWAYS_UPDATE_USER = True
 AUTH_LDAP_BACKEND = 'django_auth_ldap.backend.LDAPBackend'