WIP+reorder: retrieve libldap version on load

mistotebe · mistotebe · commit f634ae560caf · 2023-10-06T11:29:01.000+01:00
diff --git a/Modules/constants.c b/Modules/constants.c
@@ -231,6 +231,14 @@ LDAPinit_constants(PyObject *m)
     if (PyModule_AddIntConstant(m, "LIBLDAP_R", thread_safe) != 0)
         return -1;
 
+    if (ldap_get_option(NULL, LDAP_OPT_API_INFO, &ldap_version_info) != LDAP_SUCCESS) {
+        PyErr_SetString(PyExc_ImportError, "unrecognised libldap version");
+        return -1;
+    }
+    if (PyModule_AddIntConstant(m, "_VENDOR_VERSION_RUNTIME",
+                ldap_version_info.ldapai_vendor_version ) != 0)
+        return -1;
+
     /* Generated constants -- see Lib/ldap/constants.py */
 
 #define add_err(n) do {  \
diff --git a/Modules/constants.h b/Modules/constants.h
@@ -13,6 +13,8 @@ extern PyObject *LDAPerror(LDAP *);
 extern PyObject *LDAPraise_for_message(LDAP *, LDAPMessage *m);
 PyObject *LDAPerr(int errnum);
 
+extern LDAPAPIInfo ldap_version_info;
+
 #ifndef LDAP_CONTROL_PAGE_OID
 #define LDAP_CONTROL_PAGE_OID "1.2.840.113556.1.4.319"
 #endif /* !LDAP_CONTROL_PAGE_OID */
diff --git a/Modules/ldapmodule.c b/Modules/ldapmodule.c
@@ -16,6 +16,10 @@ PyMODINIT_FUNC init_ldap(void);
 #define _STR(x)        #x
 #define STR(x) _STR(x)
 
+LDAPAPIInfo ldap_version_info = {
+    .ldapai_info_version = LDAP_API_INFO_VERSION,
+};
+
 static char version_str[] = STR(LDAPMODULE_VERSION);
 static char author_str[] = STR(LDAPMODULE_AUTHOR);
 static char license_str[] = STR(LDAPMODULE_LICENSE);
