diff options
| author | Jean-Frederic Clere <jfclere@apache.org> | 2013-09-26 16:03:31 +0200 |
|---|---|---|
| committer | Jean-Frederic Clere <jfclere@apache.org> | 2013-09-26 16:03:31 +0200 |
| commit | 3fbdbdfe9c04ac2fd4ff9b8bb81965b6f841bb4c (patch) | |
| tree | a0dc8011b9fb7ec9dea55c125909f8afccb74b25 /modules/ldap | |
| parent | Follow-up to r1526436: Fix compilation error (diff) | |
| download | apache2-3fbdbdfe9c04ac2fd4ff9b8bb81965b6f841bb4c.tar.xz apache2-3fbdbdfe9c04ac2fd4ff9b8bb81965b6f841bb4c.zip | |
arrange previous fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526499 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ldap')
| -rw-r--r-- | modules/ldap/util_ldap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index a2a8b9bd81..0ae19cbdbe 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -2430,6 +2430,9 @@ static const char *util_ldap_set_trusted_client_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_config_t *dc = config; apr_finfo_t finfo; apr_status_t rv; @@ -2494,6 +2497,7 @@ static const char *util_ldap_set_trusted_client_cert(cmd_parms *cmd, } 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, 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); @@ -2536,7 +2537,6 @@ static const char *util_ldap_set_trusted_mode(cmd_parms *cmd, void *dummy, st->secure_set = 1; return(NULL); -#endif } static const char *util_ldap_set_verify_srv_cert(cmd_parms *cmd, |