apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: apr-util/ldap apr_ldap_compat.c
Date Tue, 03 Aug 2004 19:31:45 GMT
minfrin     2004/08/03 12:31:45

  Modified:    .        CHANGES
               include  apr_ldap.h.in apr_ldap.hnw apr_ldap.hw
               ldap     apr_ldap_compat.c
  Log:
  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.
  
  Revision  Changes    Path
  1.135     +4 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- CHANGES	1 Aug 2004 16:55:14 -0000	1.134
  +++ CHANGES	3 Aug 2004 19:31:45 -0000	1.135
  @@ -1,5 +1,9 @@
   Changes with APR-util 1.0
   
  +  *) 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. [Graham Leggett]
  +
     *) Add an apr_ldap_err_t structure to handle the return of LDAP
        specific error codes. [Graham Leggett, Brad Nicholes]
   
  
  
  
  1.15      +8 -18     apr-util/include/apr_ldap.h.in
  
  Index: apr_ldap.h.in
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_ldap.h.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_ldap.h.in	1 Aug 2004 17:10:57 -0000	1.14
  +++ apr_ldap.h.in	3 Aug 2004 19:31:45 -0000	1.15
  @@ -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
  
  
  
  1.12      +8 -19     apr-util/include/apr_ldap.hnw
  
  Index: apr_ldap.hnw
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_ldap.hnw,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_ldap.hnw	1 Aug 2004 17:10:57 -0000	1.11
  +++ apr_ldap.hnw	3 Aug 2004 19:31:45 -0000	1.12
  @@ -116,28 +116,17 @@
   #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
  
  
  
  1.12      +8 -20     apr-util/include/apr_ldap.hw
  
  Index: apr_ldap.hw
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_ldap.hw,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_ldap.hw	1 Aug 2004 17:10:57 -0000	1.11
  +++ apr_ldap.hw	3 Aug 2004 19:31:45 -0000	1.12
  @@ -118,29 +118,17 @@
   #define LDAPS_PORT LDAP_SSL_PORT
   #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
  
  
  
  1.8       +4 -24     apr-util/ldap/apr_ldap_compat.c
  
  Index: apr_ldap_compat.c
  ===================================================================
  RCS file: /home/cvs/apr-util/ldap/apr_ldap_compat.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_ldap_compat.c	2 Aug 2004 21:03:13 -0000	1.7
  +++ apr_ldap_compat.c	3 Aug 2004 19:31:45 -0000	1.8
  @@ -14,13 +14,6 @@
    */
   
   /*
  - * WARNING: This code below is DEPRECATED in APR v1.0.
  - *
  - * It requires an overhaul, which will be available in a later release
  - * of APR. Please expect the code below to change without notice.
  - */
  -
  -/*
    * apr_ldap_compat.c: LDAP v2/v3 compatibility things
    * 
    * Original code from auth_ldap module for Apache v1.3:
  @@ -45,24 +38,11 @@
    * missing in LDAPv2. 
    * 
    */
  -#if LDAP_VERSION_MAX == 2
   
  -/*
  - * LDAPv2 doesn't support extended search. Since auth_ldap doesn't use
  - * it anyway, we just translate the extended search into a normal search.
  +/* Note: This section 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.
    */
  -int ldap_search_ext_s(LDAP *ldap, char *base, int scope, char *filter,
  -		      char **attrs, int attrsonly, void *servertrls, void *clientctrls,
  -		      void *timeout, int sizelimit, LDAPMessage **res)
  -{
  -    return ldap_search_s(ldap, base, scope, filter, attrs, attrsonly, res);
  -}
  -
  -void ldap_memfree(void *p)
  -{
  -    free(p);
  -}
  -
  -#endif /* if LDAP_VERSION_MAX */
   
   #endif /* APR_HAS_LDAP */
  
  
  

Mime
View raw message