apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r561430 - in /apr/apr-util/trunk: CHANGES build/apu-conf.m4 include/apr_ldap.h.in ldap/apr_ldap_option.c
Date Tue, 31 Jul 2007 18:37:33 GMT
Author: trawick
Date: Tue Jul 31 11:37:32 2007
New Revision: 561430

URL: http://svn.apache.org/viewvc?view=rev&rev=561430
Log:
Support Tivoli ITDS LDAP client library, without SSL support
for now.

Submitted by: Paul Reder

I tweaked this to
 * remove comment about how SSL support might be added later
 * move some variable declarations in ldap/apr_ldap_option.c
   that weren't needed when SSL wasn't supported

Modified:
    apr/apr-util/trunk/CHANGES
    apr/apr-util/trunk/build/apu-conf.m4
    apr/apr-util/trunk/include/apr_ldap.h.in
    apr/apr-util/trunk/ldap/apr_ldap_option.c

Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?view=diff&rev=561430&r1=561429&r2=561430
==============================================================================
--- apr/apr-util/trunk/CHANGES (original)
+++ apr/apr-util/trunk/CHANGES Tue Jul 31 11:37:32 2007
@@ -1,5 +1,7 @@
 Changes with APR-util 1.3.0
 
+  *) Support Tivoli ITDS LDAP client library.  [Paul Reder]
+
   *) Portably implement testdate's long-time constants to solve
      compilation faults where #LL isn't valid.  [Curt Arnold]
 

Modified: apr/apr-util/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-conf.m4?view=diff&rev=561430&r1=561429&r2=561430
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Tue Jul 31 11:37:32 2007
@@ -227,6 +227,7 @@
 apu_has_ldap_microsoft="0"
 apu_has_ldap_netscape="0"
 apu_has_ldap_mozilla="0"
+apu_has_ldap_tivoli="0"
 apu_has_ldap_zos="0"
 apu_has_ldap_other="0"
 
@@ -329,6 +330,12 @@
                                            apr_cv_ldap_toolkit="Mozilla"])
         fi
         if test "x$apr_cv_ldap_toolkit" = "x"; then
+          AC_EGREP_CPP([International Business Machines], [$lber_h
+                       $ldap_h
+                       LDAP_VENDOR_NAME], [apu_has_ldap_tivoli="1"
+                                           apr_cv_ldap_toolkit="Tivoli"])
+        fi
+        if test "x$apr_cv_ldap_toolkit" = "x"; then
           case "$host" in
           *-ibm-os390)
             AC_EGREP_CPP([IBM], [$lber_h
@@ -366,6 +373,7 @@
 AC_SUBST(apu_has_ldap_microsoft)
 AC_SUBST(apu_has_ldap_netscape)
 AC_SUBST(apu_has_ldap_mozilla)
+AC_SUBST(apu_has_ldap_tivoli)
 AC_SUBST(apu_has_ldap_zos)
 AC_SUBST(apu_has_ldap_other)
 

Modified: apr/apr-util/trunk/include/apr_ldap.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.h.in?view=diff&rev=561430&r1=561429&r2=561430
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.h.in (original)
+++ apr/apr-util/trunk/include/apr_ldap.h.in Tue Jul 31 11:37:32 2007
@@ -40,6 +40,7 @@
 #define APR_HAS_MOZILLA_LDAPSDK   @apu_has_ldap_mozilla@
 #define APR_HAS_OPENLDAP_LDAPSDK  @apu_has_ldap_openldap@
 #define APR_HAS_MICROSOFT_LDAPSDK @apu_has_ldap_microsoft@
+#define APR_HAS_TIVOLI_LDAPSDK    @apu_has_ldap_tivoli@
 #define APR_HAS_ZOS_LDAPSDK       @apu_has_ldap_zos@
 #define APR_HAS_OTHER_LDAPSDK     @apu_has_ldap_other@
 
@@ -57,7 +58,11 @@
  * apr_ldap_url_parse*() functions have been rewritten specifically for
  * APR, so the APR_HAS_LDAP_URL_PARSE macro is forced to zero.
  */
+#if APR_HAS_TIVOLI_LDAPSDK
+#define APR_HAS_LDAP_SSL 0
+#else
 #define APR_HAS_LDAP_SSL 1
+#endif
 #define APR_HAS_LDAP_URL_PARSE      0
 
 #if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 

Modified: apr/apr-util/trunk/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_option.c?view=diff&rev=561430&r1=561429&r2=561430
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_option.c Tue Jul 31 11:37:32 2007
@@ -179,10 +179,10 @@
 static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue,
                           apr_ldap_err_t *result)
 {
-    int tls = * (const int *)invalue;
-
 #if APR_HAS_LDAP_SSL /* compiled with ssl support */
 
+    int tls = * (const int *)invalue;
+
     /* Netscape/Mozilla/Solaris SDK */
 #if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || APR_HAS_MOZILLA_LDAPSK
 #if APR_HAS_LDAPSSL_INSTALL_ROUTINES
@@ -350,11 +350,10 @@
 static void option_set_cert(apr_pool_t *pool, LDAP *ldap,
                            const void *invalue, apr_ldap_err_t *result)
 {
+#if APR_HAS_LDAP_SSL
     apr_array_header_t *certs = (apr_array_header_t *)invalue;
     struct apr_ldap_opt_tls_cert_t *ents = (struct apr_ldap_opt_tls_cert_t *)certs->elts;
     int i = 0;
-
-#if APR_HAS_LDAP_SSL
 
     /* Netscape/Mozilla/Solaris SDK */
 #if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || APR_HAS_MOZILLA_LDAPSDK



Mime
View raw message