Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1156007 - in /httpd/httpd/trunk: CHANGES
 modules/aaa/mod_authnz_ldap.c
Date: Wed, 10 Aug 2011 03:24:45 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
Message-Id: <20110810032446.13183238897D@eris.apache.org>

Author: covener
Date: Wed Aug 10 03:24:45 2011
New Revision: 1156007

URL: http://svn.apache.org/viewvc?rev=1156007&view=rev
Log:
remove (the only) retry logic in mod_authnz_ldap's authentication path 
because it's causing the ample retries in mod_ldap to be multiplied by this
outter loop.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1156007&r1=1156006&r2=1156007&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Aug 10 03:24:45 2011
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.3.15
 
+  *) mod_authnz_ldap: Don't retry during authentication, because this just 
+     multiplies the ample retries already being done by mod_ldap. [Eric Covener]
+
   *) configure: Allow to explicitly disable modules even with module selection
      'reallyall'. [Stefan Fritsch]
 

Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?rev=1156007&r1=1156006&r2=1156007&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Wed Aug 10 03:24:45 2011
@@ -533,13 +533,6 @@ start_over:
                                          &dn, &(req->vals));
     util_ldap_connection_close(ldc);
 
-    /* sanity check - if server is down, retry it up to 5 times */
-    if (AP_LDAP_IS_SERVER_DOWN(result)) {
-        if (failures++ <= 5) {
-            goto start_over;
-        }
-    }
-
     /* handle bind failure */
     if (result != LDAP_SUCCESS) {
         if (!sec->bind_authoritative) {