summaryrefslogtreecommitdiff
path: root/mail/dbmail/files/patch-0021-Update-LDAP-to-non-deprecated-search
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dbmail/files/patch-0021-Update-LDAP-to-non-deprecated-search')
-rw-r--r--mail/dbmail/files/patch-0021-Update-LDAP-to-non-deprecated-search28
1 files changed, 28 insertions, 0 deletions
diff --git a/mail/dbmail/files/patch-0021-Update-LDAP-to-non-deprecated-search b/mail/dbmail/files/patch-0021-Update-LDAP-to-non-deprecated-search
new file mode 100644
index 000000000000..edb8beff6c50
--- /dev/null
+++ b/mail/dbmail/files/patch-0021-Update-LDAP-to-non-deprecated-search
@@ -0,0 +1,28 @@
+From 00ff6ae1f64337ca6e723d060ad14873f1661447 Mon Sep 17 00:00:00 2001
+From: Alan Hicks <ahicks@p-o.co.uk>
+Date: Wed, 19 Oct 2016 17:52:04 +0100
+Subject: [PATCH 21/33] Update LDAP to non deprecated search
+
+---
+ src/modules/authldap.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git src/modules/authldap.c src/modules/authldap.c
+index fc9db8e..11c1305 100644
+--- src/modules/authldap.c
++++ src/modules/authldap.c
+@@ -282,8 +282,9 @@ static LDAPMessage * authldap_search(const gchar *query)
+ while (err != 0 && c++ < c_tries) {
+ // Loop until success or too many retries
+
+- err = ldap_search_s(_ldap_conn, _ldap_cfg.base_dn, _ldap_cfg.scope_int,
+- query, _ldap_attrs, _ldap_attrsonly, &ldap_res);
++ // timeout must be NULL as any value times out!
++ err = ldap_search_ext_s(_ldap_conn, _ldap_cfg.base_dn, _ldap_cfg.scope_int,
++ query, _ldap_attrs, _ldap_attrsonly, NULL, NULL, NULL, LDAP_NO_LIMIT, &ldap_res);
+
+ switch (err) {
+ case LDAP_SUCCESS:
+--
+2.10.1 (Apple Git-78)
+