Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 98907 invoked from network); 9 Aug 2004 17:49:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 9 Aug 2004 17:49:14 -0000 Received: (qmail 4124 invoked by uid 500); 9 Aug 2004 17:49:06 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 3950 invoked by uid 500); 9 Aug 2004 17:49:04 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 3907 invoked by uid 500); 9 Aug 2004 17:49:04 -0000 Delivered-To: apmail-apr-util-cvs@apache.org X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Date: 9 Aug 2004 17:49:01 -0000 Message-ID: <20040809174901.98673.qmail@minotaur.apache.org> From: bnicholes@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/ldap apr_ldap_init.c apr_ldap_url.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2004/08/09 10:49:01 Modified: ldap apr_ldap_init.c apr_ldap_url.c Log: Win32 LDAP SDK fixes Submitted by: mturk Revision Changes Path 1.6 +5 -1 apr-util/ldap/apr_ldap_init.c Index: apr_ldap_init.c =================================================================== RCS file: /home/cvs/apr-util/ldap/apr_ldap_init.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apr_ldap_init.c 5 Aug 2004 16:35:15 -0000 1.5 +++ apr_ldap_init.c 9 Aug 2004 17:49:01 -0000 1.6 @@ -196,7 +196,11 @@ /* clear connection requested */ if (!secure) { +#if APR_HAS_MICROSOFT_LDAPSDK + *ldap = ldap_init((char *)hostname, portno); +#else *ldap = ldap_init(hostname, portno); +#endif } else { /* ssl connnection requested */ #if APR_HAS_LDAP_SSL @@ -219,7 +223,7 @@ } } #elif APR_HAS_MICROSOFT_LDAPSDK - *ldap = ldap_sslinit(const_cast(ldc->host), ldc->port, 1); + *ldap = ldap_sslinit((char *)hostname, portno, 1); #else /* unknown toolkit - return not implemented */ return APR_ENOTIMPL; 1.9 +1 -0 apr-util/ldap/apr_ldap_url.c Index: apr_ldap_url.c =================================================================== RCS file: /home/cvs/apr-util/ldap/apr_ldap_url.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_ldap_url.c 3 Aug 2004 23:58:19 -0000 1.8 +++ apr_ldap_url.c 9 Aug 2004 17:49:01 -0000 1.9 @@ -76,6 +76,7 @@ #include "apu.h" #include "apr_pools.h" +#include "apr_strings.h" #ifndef LDAPS_PORT #define LDAPS_PORT 636 /* ldaps:/// default LDAP over TLS port */