You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2007/07/20 02:23:44 UTC
svn commit: r557823 - in /httpd/httpd/branches/2.2.x: STATUS
modules/ldap/util_ldap.c
Author: covener
Date: Thu Jul 19 17:23:41 2007
New Revision: 557823
URL: http://svn.apache.org/viewvc?view=rev&rev=557823
Log:
backport of http://svn.apache.org/viewvc?view=rev&rev=557778 from trunk:
Copy an enumeration to an int where data
is passed back into the LDAP SDK by reference
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=557823&r1=557822&r2=557823
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Jul 19 17:23:41 2007
@@ -95,12 +95,6 @@
http://svn.apache.org/viewvc?view=rev&revision=556931
+1: mturk, rpluem, jfclere
- * mod_ldap: Copy an enumeration to an int where data
- is passed back into the LDAP SDK by reference
- Trunk version of patch: (applies to 2.2.x)
- http://svn.apache.org/viewvc?view=rev&rev=557778
- +1: covener, rpluem, trawick
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
* ApacheMonitor: Fix Windows Vista detection.
Modified: httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c?view=diff&rev=557823&r1=557822&r2=557823
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c Thu Jul 19 17:23:41 2007
@@ -209,7 +209,7 @@
static int uldap_connection_init(request_rec *r,
util_ldap_connection_t *ldc )
{
- int rc = 0;
+ int rc = 0, ldap_option = 0;
int version = LDAP_VERSION3;
apr_ldap_err_t *result = NULL;
struct timeval timeOut = {10,0}; /* 10 second connection timeout */
@@ -272,7 +272,8 @@
}
/* Set the alias dereferencing option */
- ldap_set_option(ldc->ldap, LDAP_OPT_DEREF, &(ldc->deref));
+ ldap_option = ldc->deref;
+ ldap_set_option(ldc->ldap, LDAP_OPT_DEREF, &ldap_option);
/*XXX All of the #ifdef's need to be removed once apr-util 1.2 is released */
#ifdef APR_LDAP_OPT_VERIFY_CERT