53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
|
From 109066729a54f6ba5c4e8bc174133da33242e930 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Pennock <pdp@exim.org>
|
||
|
|
Date: Tue, 22 Mar 2011 06:43:34 -0400
|
||
|
|
Subject: [PATCH] Make ldap_require_cert work (not segfault).
|
||
|
|
|
||
|
|
The clang complaint, which also triggered a gcc complaint, was
|
||
|
|
legitimate. My first test, which suggested no problem, was flawed.
|
||
|
|
|
||
|
|
This:
|
||
|
|
ldap_start_tls
|
||
|
|
ldap_require_cert = demand
|
||
|
|
would cause a segfault on LDAP lookup.
|
||
|
|
|
||
|
|
fixes bug 230
|
||
|
|
---
|
||
|
|
doc/doc-txt/ChangeLog | 6 ++++++
|
||
|
|
src/src/lookups/ldap.c | 2 +-
|
||
|
|
2 files changed, 7 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
|
||
|
|
index 853f3a5..94952af 100644
|
||
|
|
--- a/doc/doc/ChangeLog
|
||
|
|
+++ b/doc/doc/ChangeLog
|
||
|
|
@@ -3,6 +3,12 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v 1.632 2010/06/12 15:21:25 jetmore Exp $
|
||
|
|
Change log file for Exim from version 4.21
|
||
|
|
-------------------------------------------
|
||
|
|
|
||
|
|
+Exim version 4.76
|
||
|
|
+-----------------
|
||
|
|
+
|
||
|
|
+PP/01 The new ldap_require_cert option would segfault if used. Fixed.
|
||
|
|
+
|
||
|
|
+
|
||
|
|
Exim version 4.75
|
||
|
|
-----------------
|
||
|
|
|
||
|
|
diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
|
||
|
|
index ddf803e..06b7494 100644
|
||
|
|
--- a/src/src/lookups/ldap.c
|
||
|
|
+++ b/src/src/lookups/ldap.c
|
||
|
|
@@ -481,7 +481,7 @@ if (lcp == NULL)
|
||
|
|
{
|
||
|
|
cert_option = LDAP_OPT_X_TLS_TRY;
|
||
|
|
}
|
||
|
|
- ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, cert_option);
|
||
|
|
+ ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &cert_option);
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
--
|
||
|
|
1.6.3.2
|
||
|
|
|