From minfrin@apache.org  Wed Jan  5 12:24:54 2005
Return-Path: <minfrin@apache.org>
Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Delivered-To: mailing list commits@apr.apache.org
Received: (qmail 23343 invoked by uid 99); 5 Jan 2005 12:24:54 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 05 Jan 2005 04:24:49 -0800
Received: (qmail 14500 invoked by uid 65534); 5 Jan 2005 12:24:43 -0000
Date: 5 Jan 2005 12:24:43 -0000
Message-ID: <20050105122443.14497.qmail@minotaur.apache.org>
From: minfrin@apache.org
To: commits@apr.apache.org
Subject: svn commit: r124195 - /apr/apr-util/branches/1.0.x/include/apr_ldap.hw /apr/apr-util/branches/1.0.x/ldap/apr_ldap_init.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked

Author: minfrin
Date: Wed Jan  5 04:24:42 2005
New Revision: 124195

URL: http://svn.apache.org/viewcvs?view=rev&rev=124195
Log:
The Microsoft version of the ldap_start_tls_s() function has 5 parameters
instead of openldap's 3.

Modified:
   apr/apr-util/branches/1.0.x/include/apr_ldap.hw
   apr/apr-util/branches/1.0.x/ldap/apr_ldap_init.c

Modified: apr/apr-util/branches/1.0.x/include/apr_ldap.hw
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.0.x/include/apr_ldap.hw?view=diff&rev=124195&p1=apr/apr-util/branches/1.0.x/include/apr_ldap.hw&r1=124194&p2=apr/apr-util/branches/1.0.x/include/apr_ldap.hw&r2=124195
==============================================================================
--- apr/apr-util/branches/1.0.x/include/apr_ldap.hw	(original)
+++ apr/apr-util/branches/1.0.x/include/apr_ldap.hw	Wed Jan  5 04:24:42 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/branches/1.0.x/ldap/apr_ldap_init.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.0.x/ldap/apr_ldap_init.c?view=diff&rev=124195&p1=apr/apr-util/branches/1.0.x/ldap/apr_ldap_init.c&r1=124194&p2=apr/apr-util/branches/1.0.x/ldap/apr_ldap_init.c&r2=124195
==============================================================================
--- apr/apr-util/branches/1.0.x/ldap/apr_ldap_init.c	(original)
+++ apr/apr-util/branches/1.0.x/ldap/apr_ldap_init.c	Wed Jan  5 04:24:42 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) {