From efeb72be80021f7e97c970e7a378fe9a9a7607f3 Mon Sep 17 00:00:00 2001
From: Kirill Roskolii <kirill.roskolii@catalyst.net.nz>
Date: Mon, 15 Apr 2024 14:53:01 +1200
Subject: [PATCH] Improve error reporting during LDAP bind

Based on the https://www.php.net/manual/en/function.ldap-error.php#121881
---
 src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php | 3 ++-
 src/Symfony/Component/Ldap/CHANGELOG.md                   | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
index 077ea5c99feec..bb7d2e4c66538 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -78,7 +78,8 @@ public function bind(?string $dn = null, #[\SensitiveParameter] ?string $passwor
                 case self::LDAP_ALREADY_EXISTS:
                     throw new AlreadyExistsException($error);
             }
-            throw new ConnectionException($error);
+            ldap_get_option($this->connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $diagnostic_message);
+            throw new ConnectionException($error.' '.$diagnostic_message);
         }
 
         $this->bound = true;
diff --git a/src/Symfony/Component/Ldap/CHANGELOG.md b/src/Symfony/Component/Ldap/CHANGELOG.md
index ad134e0fb20c0..01f86bcafb888 100644
--- a/src/Symfony/Component/Ldap/CHANGELOG.md
+++ b/src/Symfony/Component/Ldap/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Improve error reporting during LDAP bind
+
 7.0
 ---