Check whether libldap is threadsafe on startup.

mistotebe · mistotebe · commit 1e20c2d540a2 · 2022-04-20T14:50:58.000+01:00
Closes #432
diff --git a/Lib/ldap/constants.py b/Lib/ldap/constants.py
@@ -341,9 +341,7 @@ class Str(Constant):
     # XXX - these should be errors
     Int('URL_ERR_BADSCOPE'),
     Int('URL_ERR_MEM'),
-    # Int('LIBLDAP_R'),
 
-    Feature('LIBLDAP_R', 'HAVE_LIBLDAP_R'),
     Feature('SASL_AVAIL', 'HAVE_SASL'),
     Feature('TLS_AVAIL', 'HAVE_TLS'),
     Feature('INIT_FD_AVAIL', 'HAVE_LDAP_INIT_FD'),
diff --git a/Modules/constants.c b/Modules/constants.c
@@ -197,6 +197,8 @@ int
 LDAPinit_constants(PyObject *m)
 {
     PyObject *exc, *nobj;
+    struct ldap_apifeature_info info = { 1, "X_OPENLDAP_THREAD_SAFE", 0 };
+    int thread_safe = 0;
 
     /* simple constants */
 
@@ -221,6 +223,14 @@ LDAPinit_constants(PyObject *m)
         return -1;
     Py_INCREF(LDAPexception_class);
 
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+    if (ldap_get_option(NULL, LDAP_OPT_API_FEATURE_INFO, &info) == LDAP_SUCCESS) {
+        thread_safe = (info.ldapaif_version == 1);
+    }
+#endif
+    if (PyModule_AddIntConstant(m, "LIBLDAP_R", thread_safe) != 0)
+        return -1;
+
     /* Generated constants -- see Lib/ldap/constants.py */
 
 #define add_err(n) do {  \
diff --git a/setup.cfg b/setup.cfg
@@ -21,9 +21,11 @@ defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
 extra_compile_args =
 extra_objects =
 
+# Uncomment this if your libldap is not thread-safe and you need libldap_r
+# instead
 # Example for full-featured build:
 # Support for StartTLS/LDAPS, SASL bind and reentrant libldap_r.
-libs = ldap_r lber
+#libs = ldap_r lber
 
 # Installation options
 [install]
@@ -33,7 +35,7 @@ optimize = 1
 # Linux distributors/packagers should adjust these settings
 [bdist_rpm]
 provides = python-ldap
-requires = python libldap-2_4
+requires = python libldap-2
 vendor = python-ldap project
 packager = python-ldap team
 distribution_name = openSUSE 11.x
diff --git a/setup.py b/setup.py
@@ -132,7 +132,6 @@ class OpenLDAP2:
       extra_objects = LDAP_CLASS.extra_objects,
       runtime_library_dirs = (not sys.platform.startswith("win"))*LDAP_CLASS.library_dirs,
       define_macros = LDAP_CLASS.defines + \
-        ('ldap_r' in LDAP_CLASS.libs or 'oldap_r' in LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
         ('sasl' in LDAP_CLASS.libs or 'sasl2' in LDAP_CLASS.libs or 'libsasl' in LDAP_CLASS.libs)*[('HAVE_SASL',None)] + \
         ('ssl' in LDAP_CLASS.libs and 'crypto' in LDAP_CLASS.libs)*[('HAVE_TLS',None)] + \
         [

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,6 @@ class OpenLDAP2:`
`132`	`132`	`extra_objects = LDAP_CLASS.extra_objects,`
`133`	`133`	`runtime_library_dirs = (not sys.platform.startswith("win"))*LDAP_CLASS.library_dirs,`
`134`	`134`	`define_macros = LDAP_CLASS.defines + \`
`135`		`- ('ldap_r' in LDAP_CLASS.libs or 'oldap_r' in LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \`
`136`	`135`	`('sasl' in LDAP_CLASS.libs or 'sasl2' in LDAP_CLASS.libs or 'libsasl' in LDAP_CLASS.libs)*[('HAVE_SASL',None)] + \`
`137`	`136`	`('ssl' in LDAP_CLASS.libs and 'crypto' in LDAP_CLASS.libs)*[('HAVE_TLS',None)] + \`
`138`	`137`	`[`