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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1156007 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2a01b833c7ba55d5cc9d9b1c55b18b122f62de89..71ebab6fd98f810b29bf62e9a86c67949e31c6d5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 87fc4741a6c851d2896465b72df4cc7ddca4c287..eba5cbfe45ce4936078afb0b43127273cebb5a63 100644 (file)
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -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) {