Remove support for LDAP v2.0 SDK toolkits. This will be added

back properly later assuming there is demand for it. In the mean
time, please use an LDAP v3.0 SDK toolkit.

This has the side effect of removing the macro fooness in apr_ldap.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@59108 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 18 deletions

diff --git a/include/apr_ldap.h.in b/include/apr_ldap.h.in
index bf1ab2b6..ac92dd0f 100644
--- a/include/apr_ldap.h.in
+++ b/include/apr_ldap.h.in
@@ -118,27 +118,17 @@
 @ldap_h@
 #endif
 
-/* LDAPv2 SDKs don't use const parameters in their prototypes.  
- * LDAPv3 SDKs do use const.  When compiling with LDAPv2 SDKs, const_cast 
- * casts away the constness, but won't under LDAPv3 
- */
-#if LDAP_VERSION_MAX <= 2
-#define const_cast(x) ((char *)(x))
-#else
-#define const_cast(x) (x)
-#endif 
-
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 
-/* Define some errors that are mysteriously gone from OpenLDAP 2.x */
-#ifndef LDAP_URL_ERR_NOTLDAP
-#define LDAP_URL_ERR_NOTLDAP LDAP_URL_ERR_BADSCHEME
-#endif
-
-#ifndef LDAP_URL_ERR_NODN
-#define LDAP_URL_ERR_NODN LDAP_URL_ERR_BADURL
-#endif
+/* Note: Macros defining const casting has been removed in APR v1.0,
+ * pending real support for LDAP v2.0 toolkits.
+ *
+ * In the mean time, please use an LDAP v3.0 toolkit.
+ */
+#if LDAP_VERSION_MAX <= 2
+#error Support for LDAP v2.0 toolkits has been removed from apr-util. Please use an LDAP v3.0 toolkit.
+#endif 
 
 /**
  * This structure allows the C LDAP API error codes to be returned