From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 21 Aug 2012 17:48:58 +0000 (+0000)
Subject:    * include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
X-Git-Tag: 2.2.23~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde6d6bb9b8408ba2678bcc05d7f03e1dfe1de63;p=thirdparty%2Fapache%2Fhttpd.git

   * include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
     with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.

Backports: r1348036
Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Reviewed by: rjung, fuankg, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1375696 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 97a5dab618d..a970684a746 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Changes with Apache 2.2.23
      possible XSS for a site where untrusted users can upload files to
      a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
 
+  *) mod_ldap: Treat the "server unavailable" condition as a transient
+     error with all LDAP SDKs. [Filip Valder <filip.valder vsb.cz>]
+
   *) core: Add filesystem paths to access denied / access failed messages.
      [Eric Covener]
 
diff --git a/STATUS b/STATUS
index 32f53972da8..6df3bef33fa 100644
--- a/STATUS
+++ b/STATUS
@@ -99,14 +99,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~rjung/patches/htdbm-htpasswd-handling_crypt_failure-2_2.patch
      +1: rjung, trawick, wrowe
 
-   * include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
-     with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.
-     Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1348036
-     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1362056
-     2.2.x patch: http://people.apache.org/~rjung/patches/treat_ldap_unavailable_transient-2_2.patch
-     +1: rjung, fuankg, wrowe
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/include/util_ldap.h b/include/util_ldap.h
index 75a9d70a5c0..fba0e59f1ed 100644
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -30,7 +30,7 @@
 #include "apr_time.h"
 #include "apr_ldap.h"
 
-#if APR_HAS_MICROSOFT_LDAPSDK
+#ifdef LDAP_UNAVAILABLE
 #define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
                 ||(s) == LDAP_UNAVAILABLE)
 #else