From: Phil Pennock <pdp@exim.org>
Date: Tue, 22 Mar 2011 10:43:34 +0000 (-0400)
Subject: Make ldap_require_cert work (not segfault).
X-Git-Tag: exim-4_76_RC1~16
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/109066729a54f6ba5c4e8bc174133da33242e930?hp=b3c261f710276f28ea23bf86dddacdf5fb4612b4

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
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 853f3a573..94952afa5 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/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 ddf803e21..06b749469 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