Author: minfrin Date: Wed Jan 5 04:25:33 2005 New Revision: 124196 URL: http://svn.apache.org/viewcvs?view=rev&rev=124196 Log: The Microsoft version of the ldap_start_tls_s() function has 5 parameters instead of openldap's 3.
Modified: apr/apr-util/trunk/include/apr_ldap.hw apr/apr-util/trunk/ldap/apr_ldap_init.c Modified: apr/apr-util/trunk/include/apr_ldap.hw Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.hw?view=diff&rev=124196&p1=apr/apr-util/trunk/include/apr_ldap.hw&r1=124195&p2=apr/apr-util/trunk/include/apr_ldap.hw&r2=124196 ============================================================================== --- apr/apr-util/trunk/include/apr_ldap.hw (original) +++ apr/apr-util/trunk/include/apr_ldap.hw Wed Jan 5 04:25:33 2005 @@ -96,6 +96,11 @@ #define APR_HAS_LDAP_SSLINIT 1 #define APR_HAS_LDAPSSL_INIT 0 +/* + * On Windows, ldap_start_tls_s is defined with 5 parameters instead + * of the standard 3. + */ +#define APR_HAS_LDAP_START_TLS_S5 1 /* * Make sure the secure LDAP port is defined Modified: apr/apr-util/trunk/ldap/apr_ldap_init.c Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/apr_ldap_init.c?view=diff&rev=124196&p1=apr/apr-util/trunk/ldap/apr_ldap_init.c&r1=124195&p2=apr/apr-util/trunk/ldap/apr_ldap_init.c&r2=124196 ============================================================================== --- apr/apr-util/trunk/ldap/apr_ldap_init.c (original) +++ apr/apr-util/trunk/ldap/apr_ldap_init.c Wed Jan 5 04:25:33 2005 @@ -374,7 +374,7 @@ #endif } else { -#if APR_HAS_LDAP_START_TLS_S +#if APR_HAS_LDAP_START_TLS_S5 if (APR_LDAP_OPT_TLS_DEMAND == secure) { *ldap = ldap_init(hostname, portno); if (NULL != *ldap) {
