ITS#9235 Restore LDAP_API_FEATURE_X_OPENLDAP_REENTRANT

diff --git a/configure.in b/configure.in
index 368fe67d6136bd710d9858b339216560d6715938..6bd5dcdeddbd0829f56163ec90fab10daef296e0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1747,6 +1747,11 @@ fi
 if test $ol_link_threads != no ; then
        AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1,
                [define to 1 if library is thread safe])
+
+       dnl This could be enabled without threads if all of the
+       dnl reentrant functions are available. Needs testing.
+       AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT,1,
+               [define to 1 if library is reentrant])
 fi
 
 dnl ----------------------------------------------------------------

diff --git a/include/ldap.h b/include/ldap.h
index 670850647793de61dc510e8054e245b43853056c..62f8cbcee6194e99d06a8a646d44de3bb02083fe 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -54,9 +54,10 @@ LDAP_BEGIN_DECL
 /* OpenLDAP API Features */
 #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION
 
-#if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT ) || \
-       defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE )
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT )
 #      define  LDAP_API_FEATURE_THREAD_SAFE            1
+#endif
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE )
 #      define  LDAP_API_FEATURE_SESSION_THREAD_SAFE    1
 #      define  LDAP_API_FEATURE_OPERATION_THREAD_SAFE  1
 #endif

diff --git a/include/ldap_features.hin b/include/ldap_features.hin
index d8bb4c757503b557f1cc2d1760659fcdde4e9a7d..181a26d0e78d3e7820ce17d924b0b7b4c1d8d925 100644 (file)
--- a/include/ldap_features.hin
+++ b/include/ldap_features.hin
@@ -43,6 +43,9 @@
 **
 */
 
+/* is -lldap reentrant or not */
+#undef LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
+
 /* is -lldap thread safe or not */
 #undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE