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

arrange previous fix.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526499 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Frederic Clere
2013-09-26 14:03:31 +00:00
parent c833f4352b
commit 3fbdbdfe9c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ldap/util_ldap.c
View File

@@ -2430,6 +2430,9 @@ static const char *util_ldap_set_trusted_client_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_config_t *dc = config; util_ldap_config_t *dc = config;
apr_finfo_t finfo; apr_finfo_t finfo;
apr_status_t rv; apr_status_t rv;
@@ -2494,6 +2497,7 @@ static const char *util_ldap_set_trusted_client_cert(cmd_parms *cmd,
} }
return(NULL); return(NULL);
#endif
} }
@@ -2508,9 +2512,6 @@ 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);
@@ -2536,7 +2537,6 @@ static const char *util_ldap_set_trusted_mode(cmd_parms *cmd, void *dummy,
st->secure_set = 1; st->secure_set = 1;
return(NULL); return(NULL);
#endif
} }
static const char *util_ldap_set_verify_srv_cert(cmd_parms *cmd, static const char *util_ldap_set_verify_srv_cert(cmd_parms *cmd,