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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@557823 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index f41872a2747a46138891b7a0be7828b960b678b4..4e9539df0063cd4b1aeee3e6d3e7e3968b4b5adc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -95,12 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         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.

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 414372b5b716c15bc5b82ac0ba415812fcae42b0..9783a77b83ee14519ad63b115e0d7ea0357b7910 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -209,7 +209,7 @@ static apr_status_t uldap_connection_cleanup(void *param)
 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 @@ static int uldap_connection_init(request_rec *r,
     }
 
     /* 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