Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 40278 invoked from network); 20 Jan 2005 10:58:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 20 Jan 2005 10:58:41 -0000 Received: (qmail 94877 invoked by uid 500); 20 Jan 2005 10:58:39 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 94810 invoked by uid 500); 20 Jan 2005 10:58:39 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 94791 invoked by uid 99); 20 Jan 2005 10:58:39 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from castlerea.stdlib.net (HELO castlerea.stdlib.net) (80.68.89.152) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 20 Jan 2005 02:58:37 -0800 Received: from colmmacc by castlerea.stdlib.net with local (Exim 4.41) id 1Cra1K-0002es-Rq for dev@apr.apache.org; Thu, 20 Jan 2005 10:58:34 +0000 Date: Thu, 20 Jan 2005 10:58:34 +0000 From: Colm MacCarthaigh To: dev@apr.apache.org Subject: [PATCH] Make LDAP options work on win32 Message-ID: <20050120105834.GA10005@castlerea.stdlib.net.> Reply-To: colm@stdlib.net Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="HcAYCG3uE/tztfnV" Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.3.28i X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N --HcAYCG3uE/tztfnV Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 8bit Not being able to compile apr-util was starting to get annoying :) -- Colm MacC�rthaigh Public Key: colm+pgp@stdlib.net --HcAYCG3uE/tztfnV Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="win32-ldap.patch" Index: ldap/apr_ldap_option.c =================================================================== --- ldap/apr_ldap_option.c (revision 125750) +++ ldap/apr_ldap_option.c (working copy) @@ -242,8 +242,7 @@ /* Microsoft SDK */ #if APR_HAS_MICROSOFT_LDAPSDK if (tls == APR_LDAP_NONE) { - mode = 0; - result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &mode); + result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_OFF); if (result->rc != LDAP_SUCCESS) { result->reason = "LDAP: an attempt to set LDAP_OPT_SSL off " "failed."; @@ -251,8 +250,7 @@ } } else if (tls == APR_LDAP_SSL) { - mode = 1; - result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &mode); + result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_ON); if (result->rc != LDAP_SUCCESS) { result->reason = "LDAP: an attempt to set LDAP_OPT_SSL on " "failed."; @@ -514,7 +512,7 @@ /* Microsoft SDK use the registry certificate store - error out * here with a message explaining this. */ result->reason = "LDAP: CA certificates cannot be set using this method, " - "as they are stored in the registry instead." + "as they are stored in the registry instead."; result->rc = -1; #endif --HcAYCG3uE/tztfnV--