luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version: add OpenLDAP version in the output

Browse Source 
Assisted-by: Howard Chu
Closes #7054
This commit is contained in:
Daniel Stenberg 2021-05-12 11:09:12 +02:00
parent ba3452cafc
commit bf0feae776
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/version.c
View File

@ -70,6 +70,10 @@
#include <gsasl.h> #include <gsasl.h>
#endif #endif
#ifdef USE_OPENLDAP
#include <ldap.h>
#endif
#ifdef HAVE_BROTLI #ifdef HAVE_BROTLI
static size_t brotli_version(char *buf, size_t bufsz) static size_t brotli_version(char *buf, size_t bufsz)
{ {
@ -104,7 +108,7 @@ static size_t zstd_version(char *buf, size_t bufsz)
* zeros in the data. * zeros in the data.
*/ */
#define VERSION_PARTS 16 /* number of substrings we can concatenate */ #define VERSION_PARTS 17 /* number of substrings we can concatenate */
char *curl_version(void) char *curl_version(void)
{ {
@ -153,6 +157,9 @@ char *curl_version(void)
#endif #endif
#ifdef USE_GSASL #ifdef USE_GSASL
char gsasl_buf[30]; char gsasl_buf[30];
#endif
#ifdef USE_OPENLDAP
char ldap_buf[30];
#endif #endif
int i = 0; int i = 0;
int j; int j;
@ -247,6 +254,22 @@ char *curl_version(void)
gsasl_check_version(NULL)); gsasl_check_version(NULL));
src[i++] = gsasl_buf; src[i++] = gsasl_buf;
#endif #endif
#ifdef USE_OPENLDAP
{
LDAPAPIInfo api;
api.ldapai_info_version = LDAP_API_INFO_VERSION;
if(ldap_get_option(NULL, LDAP_OPT_API_INFO, &api) == LDAP_OPT_SUCCESS) {
unsigned int patch = api.ldapai_vendor_version % 100;
unsigned int major = api.ldapai_vendor_version / 10000;
unsigned int minor =
((api.ldapai_vendor_version - major * 10000) - patch) / 100;
msnprintf(ldap_buf, sizeof(ldap_buf), "%s/%u.%u.%u",
api.ldapai_vendor_name, major, minor, patch);
src[i++] = ldap_buf;
}
}
#endif
DEBUGASSERT(i <= VERSION_PARTS); DEBUGASSERT(i <= VERSION_PARTS);