Merge r1348036 from trunk:

* 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)
Reviewed by: jorton, sf, rjung

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

diff --git a/CHANGES b/CHANGES
index 32225246bc248a515ced06be5154384a9ed9afe9..bbe9f913071576e6db2064420c76fca33661d3f8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@ Changes with Apache 2.4.3
      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: Fix spurious "not allowed here" error returned when the Options 
      directive is used in .htaccess and "AllowOverride Options" (with no 
      specific options restricted) is configured.  PR 53444. [Eric Covener]

diff --git a/include/util_ldap.h b/include/util_ldap.h
index fd60ba9bcd414a901a540d13d9548eee523d6e84..3d44ba32bb7908f02a69b67160f5e6f7f333c284 100644 (file)
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -45,7 +45,7 @@
 /* this whole thing disappears if LDAP is not enabled */
 #if APR_HAS_LDAP
 
-#if APR_HAS_MICROSOFT_LDAPSDK
+#ifdef LDAP_UNAVAILABLE
 #define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
                 ||(s) == LDAP_UNAVAILABLE)
 #else