www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix for PR 54626.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526436 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Frederic Clere
2013-09-26 09:56:41 +00:00
parent d7a099b80c
commit 29a0aff51e
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,5 +1,7 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.0 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 *) worker MPM: Don't forcibly kill worker threads if the child process is
exiting gracefully. [Oracle Corporation] exiting gracefully. [Oracle Corporation]

12
modules/ldap/util_ldap.c
View File

@@ -2352,6 +2352,9 @@ static const char *util_ldap_set_trusted_global_cert(cmd_parms *cmd,
const char *file, const char *file,
const char *password) 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 *st =
(util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
&ldap_module); &ldap_module);
@@ -2409,6 +2412,7 @@ static const char *util_ldap_set_trusted_global_cert(cmd_parms *cmd,
} }
return(NULL); return(NULL);
#endif
} }
@@ -2504,6 +2508,9 @@ static const char *util_ldap_set_trusted_client_cert(cmd_parms *cmd,
static const char *util_ldap_set_trusted_mode(cmd_parms *cmd, void *dummy, static const char *util_ldap_set_trusted_mode(cmd_parms *cmd, void *dummy,
const char *mode) 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 *st =
(util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
&ldap_module); &ldap_module);
@@ -2551,6 +2558,7 @@ static const char *util_ldap_set_verify_srv_cert(cmd_parms *cmd,
st->verify_svr_cert = mode; st->verify_svr_cert = mode;
return(NULL); return(NULL);
#endif
} }
@@ -2994,10 +3002,14 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
NULL, NULL,
0, 0,
&(result_err)); &(result_err));
#if APR_HAS_MICROSOFT_LDAPSDK
/* MICROSOFT_LDAPSDK uses Microsoft Management Console (MMC) for that */
#else
if (APR_SUCCESS == rc) { if (APR_SUCCESS == rc) {
rc = apr_ldap_set_option(ptemp, NULL, APR_LDAP_OPT_TLS_CERT, rc = apr_ldap_set_option(ptemp, NULL, APR_LDAP_OPT_TLS_CERT,
(void *)st->global_certs, &(result_err)); (void *)st->global_certs, &(result_err));
} }
#endif
if (APR_SUCCESS == rc) { if (APR_SUCCESS == rc) {
st->ssl_supported = 1; st->ssl_supported = 1;