9eff14e488
- login_disabled option before starttls for pop3 - fix compiler warnings for GCC5 - Fix IMAP mailbox maintanence - prevent assertion in p_string_erase - improve crypt authentication, also don't segfault when spasswd is empty - simplify log_query_time duration logic - Disconnect IMAP clients if only few free FDs left - Add primary key constraint to dbmail_authlog - Rework temporary connection failures - Give sensible default for retry 120s - Add retries for binding and searching - Bump search timeout to 60s - Increase ldap timeout to 600s 10 mins - Refactor deprecated functions - Get timeout from config - Remove redundant event_assign - Remove deprecated non functioning g_mem_profile - Add definition for authldap_free - Revert inadvertent event_assign removal - Reduce failed LDAP connection for search to error - Update LDAP to non deprecated search - Clear the ldap connection - Update ldap deprecated unbind - Fix typo - Update to ldap_unbind_ext_s and remove redundant sigaction - Rebalance commit rollback - Ensure mailbox2dbmail is using Python 2 - Tidy mailbox2dbmail man page - Update description of pid file location in server man page - Boundaries fixups ordering of parts do not add newline on - Prepend headers during delivery - Allow for systems that don't use proc PR: 210274 Submitted by: fluffy
36 lines
1.3 KiB
Text
36 lines
1.3 KiB
Text
From fd3d09d5bbd3bd03e5eeaaec900f0e45b67ca064 Mon Sep 17 00:00:00 2001
|
|
From: Alan Hicks <ahicks@p-o.co.uk>
|
|
Date: Sun, 2 Oct 2016 17:45:42 +0100
|
|
Subject: [PATCH 10/33] Give sensible default for retry 120s
|
|
|
|
---
|
|
src/modules/authldap.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git src/modules/authldap.c src/modules/authldap.c
|
|
index 2073768..1b1b1bd 100644
|
|
--- src/modules/authldap.c
|
|
+++ src/modules/authldap.c
|
|
@@ -127,7 +127,7 @@ static LDAP * ldap_con_get(void)
|
|
}
|
|
int c = 0;
|
|
int err = -1; // Start wanting success
|
|
- while (err != 0 && c++ < 5) {
|
|
+ while (err != 0 && c++ < 120) {
|
|
// Loop until success or too many retries
|
|
TRACE(TRACE_DEBUG, "No connection trying [%d]", c);
|
|
|
|
@@ -139,8 +139,8 @@ static LDAP * ldap_con_get(void)
|
|
TRACE(TRACE_DEBUG, "connection [%p]", ld);
|
|
break;
|
|
case LDAP_SERVER_DOWN:
|
|
- TRACE(TRACE_WARNING, "LDAP gone away: %s. Trying to reconnect(%d/5).", ldap_err2string(err),c);
|
|
- sleep(2); // reconnect failed. wait before trying again
|
|
+ TRACE(TRACE_WARNING, "LDAP gone away: %s. Trying to reconnect(%d/120).", ldap_err2string(err),c);
|
|
+ sleep(1); // reconnect failed. wait before trying again
|
|
break;
|
|
default:
|
|
TRACE(TRACE_ERR, "LDAP error(%d): %s", err, ldap_err2string(err));
|
|
--
|
|
2.10.1 (Apple Git-78)
|
|
|