From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Tue, 27 Jun 2006 13:39:01 +0000 (+0000)
Subject: Define LDAP_DEPRECATED in ldap.c to get the old functions that Exim uses
X-Git-Tag: exim-4_63~42
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=765b530f2cd79d66221ba9c3d33fe94040d6748c;p=exim.git

Define LDAP_DEPRECATED in ldap.c to get the old functions that Exim uses
included in ldap.h in OpenLDAP.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b86bd4ba5..31feca73c 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.356 2006/06/07 17:42:27 fanf2 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.357 2006/06/27 13:39:01 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -35,6 +35,10 @@ TF/05 Make it easier to get SMTP authentication and TLS/SSL support working
       directives and define how usernames and passwords are checked, but
       there is now a framework to start from.
 
+PH/01 Added #define LDAP_DEPRECATED 1 to ldap.c because some of the "old"
+      functions that Exim currently uses aren't defined in ldap.h for OpenLDAP
+      without this. I don't know how relevant this is to other LDAP libraries.
+
 
 Exim version 4.62
 -----------------
diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 313640e9e..26fdb2ffc 100644
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/lookups/ldap.c,v 1.10 2006/02/07 11:19:01 ph10 Exp $ */
+/* $Cambridge: exim/src/src/lookups/ldap.c,v 1.11 2006/06/27 13:39:01 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -31,7 +31,12 @@ static void dummy(int x) { dummy(x-1); }
 #else
 
 
-/* Include LDAP headers */
+/* Include LDAP headers. The code below uses some "old" LDAP interfaces that
+are deprecated in OpenLDAP. I don't know their status in other LDAP
+implementations. LDAP_DEPRECATED causes their prototypes to be defined in
+ldap.h. */
+
+#define LDAP_DEPRECATED 1
 
 #include <lber.h>
 #include <ldap.h>