apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r652876 - in /apr/apr-util/trunk/include: apr_ldap.h.in apr_ldap.hnw apr_ldap.hw
Date Fri, 02 May 2008 19:32:03 GMT
Author: wrowe
Date: Fri May  2 12:32:03 2008
New Revision: 652876

URL: http://svn.apache.org/viewvc?rev=652876&view=rev
Log:
Wrapper for LDAP_SERVER_DOWN. where LDAP_UNAVAILABLE might occur instead.

PR: 43875
Submitted by: Eric Covener <covener gmail.com>


Modified:
    apr/apr-util/trunk/include/apr_ldap.h.in
    apr/apr-util/trunk/include/apr_ldap.hnw
    apr/apr-util/trunk/include/apr_ldap.hw

Modified: apr/apr-util/trunk/include/apr_ldap.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.h.in?rev=652876&r1=652875&r2=652876&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.h.in (original)
+++ apr/apr-util/trunk/include/apr_ldap.h.in Fri May  2 12:32:03 2008
@@ -151,6 +151,8 @@
 }
 #endif
 
+#define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
+
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"

Modified: apr/apr-util/trunk/include/apr_ldap.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.hnw?rev=652876&r1=652875&r2=652876&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.hnw (original)
+++ apr/apr-util/trunk/include/apr_ldap.hnw Fri May  2 12:32:03 2008
@@ -124,6 +124,8 @@
 }
 #endif
 
+#define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
+
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"

Modified: apr/apr-util/trunk/include/apr_ldap.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap.hw?rev=652876&r1=652875&r2=652876&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.hw (original)
+++ apr/apr-util/trunk/include/apr_ldap.hw Fri May  2 12:32:03 2008
@@ -122,6 +122,18 @@
 }
 #endif
 
+/* The MS SDK returns LDAP_UNAVAILABLE when the backend has closed the connection
+ * between LDAP calls. Protect with APR_HAS_MICROSOFT_LDAPSDK in case someone 
+ * manually chooses another SDK on Windows 
+ */
+
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
+                ||(s) == LDAP_UNAVAILABLE)
+#else
+#define APR_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN)
+#endif
+
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"



Mime
View raw message