httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r125936 - /httpd/httpd/trunk/modules/ldap/util_ldap.c
Date Fri, 21 Jan 2005 15:42:56 GMT
Author: minfrin
Date: Fri Jan 21 07:42:53 2005
New Revision: 125936

URL: http://svn.apache.org/viewcvs?view=rev&rev=125936
Log:
Remove the workaround that got client certificates to work with non
Novell LDAP SDKs, as it is no longer needed.

Modified:
   httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap.c?view=diff&rev=125936&p1=httpd/httpd/trunk/modules/ldap/util_ldap.c&r1=125935&p2=httpd/httpd/trunk/modules/ldap/util_ldap.c&r2=125936
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c	(original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c	Fri Jan 21 07:42:53 2005
@@ -261,22 +261,16 @@
     */
     if (NULL == ldc->ldap)
     {
-        /* To work around a bug in the Netware SDK, if no client certs are
-         * present (Netware client certs are global), we apply the SSL
-         * settings immediately. If client certs are present, we defer the
-         * setting of SSL on the connection until later.
-         */
-
         /* Since the host will include a port if the default port is not used,
-         * always specify the default ports for the port parameter.  This will allow
-         * a host string that contains multiple hosts the ability to mix some
-         * hosts with ports and some without. All hosts which do not specify 
-         * a port will use the default port.
+         * always specify the default ports for the port parameter.  This will
+         * allow a host string that contains multiple hosts the ability to mix
+         * some hosts with ports and some without. All hosts which do not
+         * specify a port will use the default port.
          */
         apr_ldap_init(ldc->pool, &(ldc->ldap),
                       ldc->host,
                       APR_LDAP_SSL == ldc->secure ? LDAPS_PORT : LDAP_PORT,
-                      apr_is_empty_array(ldc->client_certs) ? ldc->secure : APR_LDAP_NONE,
+                      APR_LDAP_NONE,
                       &(result));
 
 
@@ -310,8 +304,7 @@
         }
 
         /* switch on SSL/TLS */
-        if (!apr_is_empty_array(ldc->client_certs)) {
-
+        if (APR_LDAP_NONE != ldc->secure) {
             apr_ldap_set_option(ldc->pool, ldc->ldap, 
                                 APR_LDAP_OPT_TLS, &ldc->secure, &(result));
             if (LDAP_SUCCESS != result->rc) {

Mime
View raw message