diff options
author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2017-02-24 21:15:52 +0000 |
---|---|---|
committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2017-02-24 21:15:52 +0000 |
commit | 9eff14e4885b86d6f5a8b35c69ebaabd9e74df06 (patch) | |
tree | 443206cca0976456f3fd02dad4c4ebfe294c5904 /mail/dbmail/files/patch-0012-Bump-search-timeout-to-60s | |
parent | devel/py-pathlib2: add missing dependency (diff) |
mail/dbmail: adopt latest fixes from git:
- 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
Diffstat (limited to 'mail/dbmail/files/patch-0012-Bump-search-timeout-to-60s')
-rw-r--r-- | mail/dbmail/files/patch-0012-Bump-search-timeout-to-60s | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/mail/dbmail/files/patch-0012-Bump-search-timeout-to-60s b/mail/dbmail/files/patch-0012-Bump-search-timeout-to-60s new file mode 100644 index 000000000000..677028f5f201 --- /dev/null +++ b/mail/dbmail/files/patch-0012-Bump-search-timeout-to-60s @@ -0,0 +1,25 @@ +From 5ed508954309e9a5ad6610be47fd02be60f1e726 Mon Sep 17 00:00:00 2001 +From: Alan Hicks <ahicks@p-o.co.uk> +Date: Thu, 6 Oct 2016 15:04:51 +0100 +Subject: [PATCH 12/33] Bump search timeout to 60s + +--- + src/modules/authldap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/modules/authldap.c src/modules/authldap.c +index 475c985..2a39e0e 100644 +--- src/modules/authldap.c ++++ src/modules/authldap.c +@@ -266,7 +266,7 @@ static LDAPMessage * authldap_search(const gchar *query) + char **_ldap_attrs = NULL; + int err = -1; // Start wanting success + int c = 0; +- int c_tries = 10; ++ int c_tries = 60; + LDAP *_ldap_conn; + + g_return_val_if_fail(query!=NULL, NULL); +-- +2.10.1 (Apple Git-78) + |