diff options
| author | Jean-Frederic Clere <jfclere@apache.org> | 2013-09-26 09:56:41 +0000 |
|---|---|---|
| committer | Jean-Frederic Clere <jfclere@apache.org> | 2013-09-26 09:56:41 +0000 |
| commit | 29a0aff51e0de7eefe2f372deebebcc27bf6153e (patch) | |
| tree | 1b7d851b46644cd434efe3fccca958a592f76573 /modules/ldap | |
| parent | d7a099b80c6d7eee105f3722298d44eef6c02384 (diff) | |
| download | httpd-29a0aff51e0de7eefe2f372deebebcc27bf6153e.tar.gz | |
Fix for PR 54626.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526436 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ldap')
| -rw-r--r-- | modules/ldap/util_ldap.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index 461e48638a..3b156b47c3 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -2352,6 +2352,9 @@ static const char *util_ldap_set_trusted_global_cert(cmd_parms *cmd, 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_global_cert(cmd_parms *cmd, } 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, 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_srv_cert(cmd_parms *cmd, st->verify_svr_cert = mode; return(NULL); +#endif } @@ -2994,10 +3002,14 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, 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; |