Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 20502 invoked from network); 19 Jul 2007 21:14:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jul 2007 21:14:26 -0000 Received: (qmail 54466 invoked by uid 500); 19 Jul 2007 21:14:00 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 54325 invoked by uid 500); 19 Jul 2007 21:14:00 -0000 Mailing-List: contact cvs-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 cvs@httpd.apache.org Received: (qmail 54313 invoked by uid 99); 19 Jul 2007 21:14:00 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2007 14:13:59 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2007 14:13:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3ABD11A981A; Thu, 19 Jul 2007 14:13:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r557778 - /httpd/httpd/trunk/modules/ldap/util_ldap.c Date: Thu, 19 Jul 2007 21:13:37 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070719211337.3ABD11A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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