[exim-cvs] Solaris build fix for Oracle's LDAP libraries.

Gitweb: http://git.exim.org/exim.git/commitdiff/867fcbf59a53d5acbab505bc7670e7d0c29dbc94

Commit:     867fcbf59a53d5acbab505bc7670e7d0c29dbc94
Parent:     bdf1527974ee0faf5ac41c4554a89d161b6249e1
Author:     Phil Pennock <pdp@???>
AuthorDate: Mon May 9 05:31:39 2011 -0400
Committer:  Phil Pennock <pdp@???>
CommitDate: Mon May 9 05:31:39 2011 -0400

    Solaris build fix for Oracle's LDAP libraries.

    Patch from Stephen Usher.
    fixes 1109
---
 doc/doc-txt/ChangeLog  |    7 +++++++
 src/src/lookups/ldap.c |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 5922770..d3b3609 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 06b7494..2a4199c 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)
     {