[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Philip Hazel
Datum:  
To: exim-cvs
Betreff: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src/lookups ldap.c
ph10 2006/06/27 14:39:01 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src/lookups ldap.c 
  Log:
  Define LDAP_DEPRECATED in ldap.c to get the old functions that Exim uses
  included in ldap.h in OpenLDAP.


  Revision  Changes    Path
  1.357     +4 -0      exim/exim-doc/doc-txt/ChangeLog
  1.11      +6 -1      exim/exim-src/src/lookups/ldap.c


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.356
  retrieving revision 1.357
  diff -u -r1.356 -r1.357
  --- ChangeLog    7 Jun 2006 17:42:27 -0000    1.356
  +++ ChangeLog    27 Jun 2006 13:39:01 -0000    1.357
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.356 2006/06/07 17:42:27 fanf2 Exp $
  +$Cambridge: exim/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
   -------------------------------------------
  @@ -34,6 +34,10 @@
         configuration file. A little bit of work is required to uncomment the
         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

  Index: ldap.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/lookups/ldap.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ldap.c    7 Feb 2006 11:19:01 -0000    1.10
  +++ ldap.c    27 Jun 2006 13:39:01 -0000    1.11
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/lookups/ldap.c,v 1.10 2006/02/07 11:19:01 ph10 Exp $ */
  +/* $Cambridge: exim/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 @@
   #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>