# HG changeset patch # User Marcin Kuzminski # Date 2017-11-11 09:29:31 # Node ID 565a855c19338d9929e603919ce789f0c2a36e59 # Parent 355b5a7a2364f9b4fa9c53d653a763d0b10c2465 ldap: increase timeouts and timelimits for operations diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py --- a/rhodecode/authentication/plugins/auth_ldap.py +++ b/rhodecode/authentication/plugins/auth_ldap.py @@ -234,9 +234,9 @@ class AuthLdap(object): '/etc/openldap/cacerts') ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF) ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON) - ldap.set_option(ldap.OPT_TIMEOUT, 20) - ldap.set_option(ldap.OPT_NETWORK_TIMEOUT, 10) - ldap.set_option(ldap.OPT_TIMELIMIT, 15) + ldap.set_option(ldap.OPT_NETWORK_TIMEOUT, 60 * 10) + ldap.set_option(ldap.OPT_TIMEOUT, 60 * 10) + if self.TLS_KIND != 'PLAIN': ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, self.TLS_REQCERT) server = ldap.initialize(self.LDAP_SERVER)