apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r125906 - /apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c /apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c
Date Fri, 21 Jan 2005 09:04:46 GMT
Author: minfrin
Date: Fri Jan 21 01:04:44 2005
New Revision: 125906

URL: http://svn.apache.org/viewcvs?view=rev&rev=125906
Log:
Use the ldapssl_init(host,port,0) function on Novell to init LDAP connections.
This removes the need to apply a workaround to support client certificates
within an end user application.
Submitted by: Brad Nicholes

Modified:
   apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c
   apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c

Modified: apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c?view=diff&rev=125906&p1=apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c&r1=125905&p2=apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c&r2=125906
==============================================================================
--- apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c	(original)
+++ apr/apr-util/branches/1.1.x/ldap/apr_ldap_init.c	Fri Jan 21 01:04:44 2005
@@ -145,12 +145,7 @@
     *result_err = result;
 
 #if APR_HAS_NOVELL_LDAPSDK
-    if (secure == APR_LDAP_SSL) {
-        *ldap = ldapssl_init(hostname, portno, 1);
-    }
-    else {
-        *ldap = ldapssl_init(hostname, portno, 0);
-    }
+    *ldap = ldapssl_init(hostname, portno, 0);
 #else
     *ldap = ldap_init((char *)hostname, portno);
 #endif

Modified: apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c?view=diff&rev=125906&p1=apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c&r1=125905&p2=apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c&r2=125906
==============================================================================
--- apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c	(original)
+++ apr/apr-util/branches/1.1.x/ldap/apr_ldap_option.c	Fri Jan 21 01:04:44 2005
@@ -174,14 +174,14 @@
      * 
      * STARTTLS is supported by the ldap_start_tls_s() method
      */
-    /*if ((tls == APR_LDAP_SSL) || (tls == APR_LDAP_STARTTLS)) {
+    if (tls == APR_LDAP_SSL) {
         result->rc = ldapssl_install_routines(ldap);
         if (result->rc != LDAP_SUCCESS) {
             result->msg = ldap_err2string(result->rc);
             result->reason = "LDAP: Could not switch SSL on for this "
                              "connection.";
         }
-    }*/
+    }
     if (tls == APR_LDAP_STARTTLS) {
         result->rc = ldapssl_start_tls(ldap);
         if (result->rc != LDAP_SUCCESS) {

Mime
View raw message