svn commit: r395227 - in /apr/apr-util/branches/1.2.x: CHANGES include/apr_ldap.h.in

[jo...@apache.org]

Author: jorton
Date: Wed Apr 19 04:58:00 2006
New Revision: 395227

URL: http://svn.apache.org/viewcvs?rev=395227&view=rev
Log:
Merge r391985 from trunk:

* include/apr_ldap.h.in: For OpenLDAP, before including <ldap.h>,
define LDAP_DEPRECATED to 1 if it is not already defined.  Fixes use
of OpenLDAP 2.3, which by default hides the ldap_init() etc
prototypes, which can have rather catastrophic effects at runtime.
(since the compiler presumes ldap_init() returns int and discards the
top half of the LDAP * pointer value on 64-bit platforms)

Modified:
    apr/apr-util/branches/1.2.x/CHANGES
    apr/apr-util/branches/1.2.x/include/apr_ldap.h.in

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/CHANGES?rev=395227&r1=395226&r2=395227&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES (original)
+++ apr/apr-util/branches/1.2.x/CHANGES Wed Apr 19 04:58:00 2006
@@ -1,5 +1,8 @@
 Changes with APR-util 1.2.8
 
+  *) Fix to ensure that "deprecated" LDAP interfaces are still 
+     exposed if using OpenLDAP 2.3.  [Joe Orton]
+
   *) Fix incorrect byte order and incorrect timestamp type
      in the fallback UUID generator used when no external UUID
      generator is detected by APR.  PR 37342.  [Max Bowsher]

Modified: apr/apr-util/branches/1.2.x/include/apr_ldap.h.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/include/apr_ldap.h.in?rev=395227&r1=395226&r2=395227&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apr_ldap.h.in (original)
+++ apr/apr-util/branches/1.2.x/include/apr_ldap.h.in Wed Apr 19 04:58:00 2006
@@ -59,6 +59,12 @@
 #define APR_HAS_LDAP_SSL 1
 #define APR_HAS_LDAP_URL_PARSE      0
 
+#if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
+/* Ensure that the "deprecated" interfaces are still exposed
+ * with OpenLDAP >= 2.3; these were exposed by default in earlier
+ * releases. */
+#define LDAP_DEPRECATED 1
+#endif
 
 /*
  * Include the standard LDAP header files.