mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 09:36:41 -04:00
84e2af53f3
Changelog: https://gitlab.linphone.org/BC/public/liblinphone/-/tags/5.4.4 Sponsored by: Cybermancer Infosec
29 lines
1.5 KiB
C++
29 lines
1.5 KiB
C++
--- src/ldap/ldap-contact-provider.cpp.orig 2025-03-20 22:21:32 UTC
|
|
+++ src/ldap/ldap-contact-provider.cpp
|
|
@@ -269,7 +269,9 @@ void LdapContactProvider::initializeLdap() {
|
|
lError() << "[LDAP] Problem initializing TLS on setting require SAN '" << mServerUrl[mServerUrlIndex]
|
|
<< "': " << ret << " (" << ldap_err2string(ret) << ")";
|
|
|
|
+#ifdef LDAP_OPT_X_TLS_RANDOM_FUNC
|
|
ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_RANDOM_FUNC, (void *)randomProvider);
|
|
+#endif
|
|
if (ret != LDAP_SUCCESS) {
|
|
lError() << "[LDAP] Problem initializing TLS random generator function.";
|
|
}
|
|
@@ -291,16 +293,6 @@ void LdapContactProvider::initializeLdap() {
|
|
<< ldap_err2string(ret) << "), err " << err << " (" << ldap_err2string(err) << ")";
|
|
fallbackToNextServerUrl();
|
|
} else if (mConfig.count("use_tls") > 0 && mConfig["use_tls"][0] == "1") {
|
|
- if (mConfig.count("use_sal") > 0 &&
|
|
- mConfig["use_sal"][0] ==
|
|
- "1") { // Using Sal give an IP for a domain. So check the domain rather than the IP.
|
|
- belle_generic_uri_t *serverUri = belle_generic_uri_parse(
|
|
- mConfig["server"][mConfigServerIndex].c_str()); // mServer are results of sal. Use the root urls.
|
|
- const char *cHost = belle_generic_uri_get_host(serverUri);
|
|
- std::string hostname = cHost ? cHost : "";
|
|
- ldap_set_option(mLd, LDAP_OPT_X_TLS_PEER_CN, &hostname[0]);
|
|
- if (serverUri) belle_sip_object_unref(serverUri);
|
|
- }
|
|
mTlsConnectionId = -1;
|
|
mCurrentAction = ACTION_WAIT_TLS_CONNECT;
|
|
mTlsConnectionTimeout = time(NULL);
|