From: Phil Pennock <pdp@exim.org>
Date: Mon, 9 May 2011 09:31:39 +0000 (-0400)
Subject: Solaris build fix for Oracle's LDAP libraries.
X-Git-Tag: list_safety_merge_proposal~28
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=867fcbf59a53d5acbab505bc7670e7d0c29dbc94

Solaris build fix for Oracle's LDAP libraries.

Patch from Stephen Usher.
fixes 1109
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 59227705d..d3b3609f3 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -3,6 +3,13 @@ $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.77
+-----------------
+
+PP/01 Solaris build fix for Oracle's LDAP libraries.
+      Bugzilla 1109, patch from Stephen Usher.
+
+
 Exim version 4.76
 -----------------
 
diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 06b749469..2a4199c3a 100644
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -521,10 +521,13 @@ if (!lcp->bound ||
   {
   DEBUG(D_lookup) debug_printf("%sbinding with user=%s password=%s\n",
     (lcp->bound)? "re-" : "", user, password);
+#ifdef LDAP_OPT_X_TLS
+  /* The Oracle LDAP libraries (LDAP_LIB_TYPE=SOLARIS) don't support this: */
   if (eldap_start_tls)
     {
     ldap_start_tls_s(lcp->ld, NULL, NULL);
     }
+#endif
   if ((msgid = ldap_bind(lcp->ld, CS user, CS password, LDAP_AUTH_SIMPLE))
        == -1)
     {