diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | ldap/apr_ldap_option.c | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with APR-util 1.3.0 + *) Fix the setting of LDAP_OPT_SSL on Win2k, which expects a pointer to + the value LDAP_OPT_ON, and not the value itself. XP works with both. + [Victor <victorjss@gmail.com>] + *) Fix a regression in apr_brigade_partition that causes integer overflows on systems where apr_off_t > apr_size_t. [Ruediger Pluem] diff --git a/ldap/apr_ldap_option.c b/ldap/apr_ldap_option.c index c845299a..b2b3eaeb 100644 --- a/ldap/apr_ldap_option.c +++ b/ldap/apr_ldap_option.c @@ -325,7 +325,8 @@ static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue, /* Microsoft SDK */ #if APR_HAS_MICROSOFT_LDAPSDK if (tls == APR_LDAP_NONE) { - result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_OFF); + ULONG ul = (ULONG) LDAP_OPT_OFF; + result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &ul); if (result->rc != LDAP_SUCCESS) { result->reason = "LDAP: an attempt to set LDAP_OPT_SSL off " "failed."; @@ -333,7 +334,8 @@ static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue, } } else if (tls == APR_LDAP_SSL) { - result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_ON); + ULONG ul = (ULONG) LDAP_OPT_ON; + result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &ul); if (result->rc != LDAP_SUCCESS) { result->reason = "LDAP: an attempt to set LDAP_OPT_SSL on " "failed."; |