Merge 1408402 from trunk:

followup to r1348036, MSSDK's WinLdap.h uses an enum for LDAP_* status codes, so the block is not included

Submitted by: covener
Reviewed by: covener, trawick, igalic

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

diff --git a/CHANGES b/CHANGES
index 72fc21c70f294ba38d724c13af2c626606a4cf9f..7eb4b7055823a400bead575d211dc2d0e127385b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache 2.4.4
+
+  *) mod_ldap: Fix regression in handling "server unavailable" errors on 
+     Windows.  PR 54140.  [Eric Covener]
  
   *) syslog logging: Remove stray ", referer" at the end of some messages.
      [Jeff Trawick]

diff --git a/include/util_ldap.h b/include/util_ldap.h
index 3d44ba32bb7908f02a69b67160f5e6f7f333c284..c31539817e285f8d9c25bb477af34413c1e0cb33 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
 
-#ifdef LDAP_UNAVAILABLE
+#if defined(LDAP_UNAVAILABLE) || APR_HAS_MICROSOFT_LDAPSDK
 #define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
                 ||(s) == LDAP_UNAVAILABLE)
 #else