httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r1526436 - in /httpd/httpd/trunk: CHANGES modules/ldap/util_ldap.c
Date Thu, 26 Sep 2013 09:56:41 GMT
Author: jfclere
Date: Thu Sep 26 09:56:41 2013
New Revision: 1526436

URL: http://svn.apache.org/r1526436
Log:
Fix for PR 54626.

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

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1526436&r1=1526435&r2=1526436&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Sep 26 09:56:41 2013
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
+  *) ldap: Allow to support ldaps on the microsoft ldap sdk
+     PR 54626. [Jean-Frederic Clere]
 
   *) worker MPM: Don't forcibly kill worker threads if the child process is
      exiting gracefully.  [Oracle Corporation]

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=1526436&r1=1526435&r2=1526436&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Thu Sep 26 09:56:41 2013
@@ -2352,6 +2352,9 @@ static const char *util_ldap_set_trusted
                                                      const char *file,
                                                      const char *password)
 {
+#if APR_HAS_MICROSOFT_LDAPSDK
+    return "certificates cannot be set using this method.";
+#else
     util_ldap_state_t *st =
         (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
                                                   &ldap_module);
@@ -2409,6 +2412,7 @@ static const char *util_ldap_set_trusted
     }
 
     return(NULL);
+#endif
 }
 
 
@@ -2504,6 +2508,9 @@ static const char *util_ldap_set_trusted
 static const char *util_ldap_set_trusted_mode(cmd_parms *cmd, void *dummy,
                                               const char *mode)
 {
+#if APR_HAS_MICROSOFT_LDAPSDK
+    return "certificates cannot be set using this method.";
+#else
     util_ldap_state_t *st =
     (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
                                               &ldap_module);
@@ -2551,6 +2558,7 @@ static const char *util_ldap_set_verify_
     st->verify_svr_cert = mode;
 
     return(NULL);
+#endif
 }
 
 
@@ -2994,10 +3002,14 @@ static int util_ldap_post_config(apr_poo
                       NULL,
                       0,
                       &(result_err));
+#if APR_HAS_MICROSOFT_LDAPSDK
+   /* MICROSOFT_LDAPSDK uses Microsoft Management Console (MMC)  for that */
+#else
     if (APR_SUCCESS == rc) {
         rc = apr_ldap_set_option(ptemp, NULL, APR_LDAP_OPT_TLS_CERT,
                                  (void *)st->global_certs, &(result_err));
     }
+#endif
 
     if (APR_SUCCESS == rc) {
         st->ssl_supported = 1;



Mime
View raw message