Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 41457 invoked from network); 5 Jan 2005 07:07:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 5 Jan 2005 07:07:56 -0000 Received: (qmail 66887 invoked by uid 500); 5 Jan 2005 07:07:54 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 66845 invoked by uid 500); 5 Jan 2005 07:07:53 -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: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 66821 invoked by uid 99); 5 Jan 2005 07:07:52 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 04 Jan 2005 23:07:51 -0800 Received: (qmail 41409 invoked by uid 65534); 5 Jan 2005 07:07:50 -0000 Date: 5 Jan 2005 07:07:50 -0000 Message-ID: <20050105070750.41399.qmail@minotaur.apache.org> From: minfrin@apache.org To: cvs@httpd.apache.org Subject: svn commit: r124187 - /httpd/httpd/trunk/CHANGES /httpd/httpd/trunk/modules/ldap/util_ldap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: minfrin Date: Tue Jan 4 23:07:46 2005 New Revision: 124187 URL: http://svn.apache.org/viewcvs?view=rev&rev=124187 Log: Fix some compiler warnings inside the LDAP modules Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/ldap/util_ldap.c Modified: httpd/httpd/trunk/CHANGES Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&rev=124187&p1=httpd/httpd/trunk/CHANGES&r1=124186&p2=httpd/httpd/trunk/CHANGES&r2=124187 ============================================================================== --- httpd/httpd/trunk/CHANGES (original) +++ httpd/httpd/trunk/CHANGES Tue Jan 4 23:07:46 2005 @@ -2,6 +2,8 @@ [Remove entries to the current 2.0 section below, when backported] + *) Remove some compiler warnings within the LDAP modules [Graham Leggett] + *) Add a build script to create a solaris package. [Graham Leggett] *) ap_http_scheme() replaced with ap_http_method() - this function Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap.c?view=diff&rev=124187&p1=httpd/httpd/trunk/modules/ldap/util_ldap.c&r1=124186&p2=httpd/httpd/trunk/modules/ldap/util_ldap.c&r2=124187 ============================================================================== --- httpd/httpd/trunk/modules/ldap/util_ldap.c (original) +++ httpd/httpd/trunk/modules/ldap/util_ldap.c Tue Jan 4 23:07:46 2005 @@ -264,7 +264,8 @@ a host string that contains multiple hosts the ability to mix some hosts with ports and some without. All hosts which do not specify a port will use the default port.*/ - apr_ldap_init(r->pool, &(ldc->ldap), ldc->host, ldc->secure?LDAPS_PORT:LDAP_PORT, + apr_ldap_init(r->pool, &(ldc->ldap), + ldc->host, ldc->secure?LDAPS_PORT:LDAP_PORT, ldc->secure, &(result)); if (result != NULL) { @@ -298,7 +299,9 @@ */ for (failures=0; failures<10; failures++) { - result = ldap_simple_bind_s(ldc->ldap, ldc->binddn, ldc->bindpw); + result = ldap_simple_bind_s(ldc->ldap, + (char *)ldc->binddn, + (char *)ldc->bindpw); if (LDAP_SERVER_DOWN != result) break; } @@ -529,7 +532,7 @@ } /* search for reqdn */ - if ((result = ldap_search_ext_s(ldc->ldap, reqdn, LDAP_SCOPE_BASE, + if ((result = ldap_search_ext_s(ldc->ldap, (char *)reqdn, LDAP_SCOPE_BASE, "(objectclass=*)", NULL, 1, NULL, NULL, NULL, -1, &res)) == LDAP_SERVER_DOWN) { ldc->reason = "DN Comparison ldap_search_ext_s() failed with server down"; @@ -661,8 +664,11 @@ return result; } - if ((result = ldap_compare_s(ldc->ldap, dn, attrib, value)) - == LDAP_SERVER_DOWN) { + if ((result = ldap_compare_s(ldc->ldap, + (char *)dn, + (char *)attrib, + (char *)value)) + == LDAP_SERVER_DOWN) { /* connection failed - try again */ ldc->reason = "ldap_compare_s() failed with server down"; util_ldap_connection_unbind(ldc); @@ -790,8 +796,8 @@ /* try do the search */ if ((result = ldap_search_ext_s(ldc->ldap, - basedn, scope, - filter, attrs, 0, + (char *)basedn, scope, + (char *)filter, attrs, 0, NULL, NULL, NULL, -1, &res)) == LDAP_SERVER_DOWN) { ldc->reason = "ldap_search_ext_s() for user failed with server down"; util_ldap_connection_unbind(ldc); @@ -844,10 +850,11 @@ * fails, it means that the password is wrong (the dn obviously * exists, since we just retrieved it) */ - if ((result = - ldap_simple_bind_s(ldc->ldap, *binddn, bindpw)) == - LDAP_SERVER_DOWN) { - ldc->reason = "ldap_simple_bind_s() to check user credentials failed with server down"; + if ((result = ldap_simple_bind_s(ldc->ldap, + (char *)*binddn, + (char *)bindpw)) == LDAP_SERVER_DOWN) { + ldc->reason = "ldap_simple_bind_s() to check user credentials " + "failed with server down"; ldap_msgfree(res); util_ldap_connection_unbind(ldc); goto start_over; @@ -1017,8 +1024,10 @@ /* try do the search */ if ((result = ldap_search_ext_s(ldc->ldap, - basedn, scope, filter, attrs, 0, - NULL, NULL, NULL, -1, &res)) == LDAP_SERVER_DOWN) { + (char *)basedn, scope, + (char *)filter, attrs, 0, + NULL, NULL, + NULL, -1, &res)) == LDAP_SERVER_DOWN) { ldc->reason = "ldap_search_ext_s() for user failed with server down"; goto start_over; }