From: Joe Orton <jorton@apache.org>
Date: Fri, 8 Jun 2012 12:19:30 +0000 (+0000)
Subject: * include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
X-Git-Tag: 2.5.0-alpha~6745
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df256851fa82b2ef75ece7e3acfcf916ea04110c;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.

Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)


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

diff --git a/CHANGES b/CHANGES
index a0dde1a9f02..f083fdb87b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_ldap: Treat the "server unavailable" condition as a transient
+     error with all LDAP SDKs.  [Filip Valder <filip.valder vsb.cz>]
+
   *) mod_ssl: Add support for TLS-SRP (Secure Remote Password key exchange
      for TLS, RFC 5054). PR 51075. [Quinn Slack <sqs cs stanford edu>,
      Christophe Renou, Peter Sylvester]
diff --git a/include/util_ldap.h b/include/util_ldap.h
index fd60ba9bcd4..3d44ba32bb7 100644
--- 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