upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9235 Delete LDAP_THREAD_SAFE

Browse source
This commit is contained in:
Ryan Tandy 2020-05-30 10:34:16 -07:00
parent a5414507b6
commit a4474d3584
4 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/ldap.h
View file

@ -55,19 +55,11 @@ LDAP_BEGIN_DECL
#define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION
#if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT ) || \ #if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT ) || \
( defined( LDAP_THREAD_SAFE ) && \ defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE )
defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) )
/* -lldap may or may not be thread safe */
/* -lldap_r, if available, is always thread safe */
# define LDAP_API_FEATURE_THREAD_SAFE 1 # define LDAP_API_FEATURE_THREAD_SAFE 1
# define LDAP_API_FEATURE_SESSION_THREAD_SAFE 1 # define LDAP_API_FEATURE_SESSION_THREAD_SAFE 1
# define LDAP_API_FEATURE_OPERATION_THREAD_SAFE 1 # define LDAP_API_FEATURE_OPERATION_THREAD_SAFE 1
#endif #endif
#if defined( LDAP_THREAD_SAFE ) && \
defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE )
/* #define LDAP_API_FEATURE_SESSION_SAFE 1 */
/* #define LDAP_API_OPERATION_SESSION_SAFE 1 */
#endif
#define LDAP_PORT 389 /* ldap:/// default LDAP port */ #define LDAP_PORT 389 /* ldap:/// default LDAP port */

9
include/ldap_features.hin
View file

@ -41,13 +41,8 @@
** LDAP_API_FEATURE_OPERATION_THREAD_SAFE ** LDAP_API_FEATURE_OPERATION_THREAD_SAFE
** **
** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
** can be used to determine if -lldap_r is available at compile ** can be used to determine if -lldap is thread safe at compile
** time. You must define LDAP_THREAD_SAFE if and only if you ** time.
** link with -lldap_r.
**
** If you fail to define LDAP_THREAD_SAFE when linking with
** -lldap_r or define LDAP_THREAD_SAFE when linking with -lldap,
** provided header definitions and declarations may be incorrect.
** **
*/ */

1
libraries/libldap/ldap-int.h
View file

@ -22,7 +22,6 @@
#ifndef NO_THREADS #ifndef NO_THREADS
#define LDAP_R_COMPILE 1 #define LDAP_R_COMPILE 1
#define LDAP_THREAD_SAFE 1
#endif #endif
#include "../liblber/lber-int.h" #include "../liblber/lber-int.h"

3
libraries/libldap/options.c
View file

@ -71,8 +71,7 @@ static const LDAPAPIFeatureInfo features[] = {
LDAP_API_FEATURE_X_OPENLDAP_REENTRANT LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
}, },
#endif #endif
#if defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) && \ #ifdef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
defined( LDAP_THREAD_SAFE )
{ /* OpenLDAP Thread Safe */ { /* OpenLDAP Thread Safe */
LDAP_FEATURE_INFO_VERSION, LDAP_FEATURE_INFO_VERSION,
"X_OPENLDAP_THREAD_SAFE", "X_OPENLDAP_THREAD_SAFE",