Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 47902 invoked from network); 3 Aug 2005 17:57:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Aug 2005 17:57:56 -0000 Received: (qmail 65346 invoked by uid 500); 3 Aug 2005 17:57:50 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 65171 invoked by uid 500); 3 Aug 2005 17:57:49 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 64967 invoked by uid 99); 3 Aug 2005 17:57:48 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2005 10:57:48 -0700 X-ASF-Spam-Status: No, hits=0.3 required=10.0 tests=FORGED_RCVD_HELO,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [207.155.252.112] (HELO leander.cnchost.com) (207.155.252.112) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2005 10:57:38 -0700 Received: from rcsv650.rowe-clan.net (c-24-13-128-132.hsd1.il.comcast.net [24.13.128.132]) by leander.cnchost.com id NAA19792; Wed, 3 Aug 2005 13:57:42 -0400 (EDT) [ConcentricHost SMTP Relay 1.17] Errors-To: Message-Id: <6.2.1.2.2.20050803124703.076e2400@pop3.rowe-clan.net> X-Mailer: QUALCOMM Windows Eudora Version 6.2.1.2 Date: Wed, 03 Aug 2005 12:47:27 -0500 To: dev@httpd.apache.org From: "William A. Rowe, Jr." Subject: Re: [PATCH] fix util_ldap with older OpenLDAPs Cc: , In-Reply-To: <42F0A981020000AC00001764@lyle.provo.novell.com> References: <42F0A981020000AC00001764@lyle.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N At 12:24 PM 8/3/2005, Brad Nicholes wrote: >The correct code should be: > >Index: util_ldap.c >=================================================================== >--- util_ldap.c (revision 226877) >+++ util_ldap.c (working copy) >@@ -325,7 +325,7 @@ > } > > if (st->connectionTimeout >= 0) { >- rc = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, (void >*)&timeOut); >+ rc = ldap_set_option(ldc->ldap, LDAP_OPT_NETWORK_TIMEOUT, >(void *)&timeOut); > if (APR_SUCCESS != rc) { > ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, > "LDAP: Could not set the connection >timeout" ); +1 to committing this fix.