29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 23:02:55 +00:00

[4.x] Fix LDAP debugging functionality (#38388)

* Restore broken ldap debugging functionality

* Fix composer.lock

* Remove unnecessary change

* More recent symfony/ldap to include https://github.com/symfony/symfony/pull/47547

* fix hash in composer.lock

* Update composer.lock

---------
This commit is contained in:
tatankat 2023-01-30 14:15:37 +01:00 committed by GitHub
parent 5ebb39b35f
commit 8f94ab0307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -77,7 +77,7 @@
"psr/link": "~1.0",
"symfony/console": "~5.0",
"symfony/error-handler": "^5.2",
"symfony/ldap": "~5.0",
"symfony/ldap": "^5.4.13",
"symfony/options-resolver": "~5.0",
"symfony/polyfill-mbstring": "^1.27",
"symfony/polyfill-php73": "^1.10",

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "71f099696f92e248e54a0d93c60e82c7",
"content-hash": "e29fb961f2b568d70f3a02932a5208b6",
"packages": [
{
"name": "algo26-matthias/idna-convert",

View File

@ -122,6 +122,7 @@ final class Ldap extends CMSPlugin
'version' => $this->params->get('use_ldapV3', '1') == '1' ? 3 : 2,
'referrals' => (bool) $this->params->get('no_referrals', '0'),
'encryption' => $this->params->get('encryption', 'none'),
'debug' => (bool) $this->params->get('ldap_debug', '0'),
'options' => [
'x_tls_require_cert' => $ignore_reqcert_tls ? LDAP_OPT_X_TLS_NEVER : LDAP_OPT_X_TLS_DEMAND,
],