From df256851fa82b2ef75ece7e3acfcf916ea04110c Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 8 Jun 2012 12:19:30 +0000 Subject: [PATCH] * 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 (via RH bugzilla) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1348036 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ include/util_ldap.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a0dde1a9f0..f083fdb87b 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 ] + *) mod_ssl: Add support for TLS-SRP (Secure Remote Password key exchange for TLS, RFC 5054). PR 51075. [Quinn Slack , Christophe Renou, Peter Sylvester] diff --git a/include/util_ldap.h b/include/util_ldap.h index fd60ba9bcd..3d44ba32bb 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 -- 2.50.1