svn commit: r557778 - /httpd/httpd/trunk/modules/ldap/util_ldap.c

[co...@apache.org]

Author: covener
Date: Thu Jul 19 14:13:36 2007
New Revision: 557778

URL: http://svn.apache.org/viewvc?view=rev&rev=557778
Log:
Copy the enum into an integer before sending off to the LDAP SDK, to avoid
passing the address of a short (seen on z/OS)

Modified:
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?view=diff&rev=557778&r1=557777&r2=557778
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Thu Jul 19 14:13:36 2007
@@ -203,7 +203,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 */
@@ -266,7 +266,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