Merge pull request #65 from pajavyskocil/fix_bad_error_message

vyskocilpavel · web-flow · commit 906be7eebbc0 · 2019-08-15T16:16:44.000+02:00
Fixed bad error message when the process of bind user to LDAP failed
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 
 #### Fixed
 - Fixed the problem that IDP filter on WAYF didn't work correctly
+- Fixed bad error message when the process of bind user to LDAP failed
 
 ## [v3.1.1]
 #### Fixed
diff --git a/lib/LdapConnector.php b/lib/LdapConnector.php
@@ -110,7 +110,7 @@ protected function search($base, $filter, $attributes = null)
         ldap_set_option($conn, LDAP_OPT_PROTOCOL_VERSION, 3);
 
         if (ldap_bind($conn, $this->user, $this->password) === false) {
-            throw new Exception('Unable to connect to the Perun LDAP, ' . $this->hostname);
+            throw new Exception('Unable to bind user to the Perun LDAP, ' . $this->hostname);
         }
 
         Logger::debug("sspmod_perun_LdapConnector.search - Connection to Perun LDAP established. " .

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ protected function search($base, $filter, $attributes = null)`
`110`	`110`	`ldap_set_option($conn, LDAP_OPT_PROTOCOL_VERSION, 3);`
`111`	`111`
`112`	`112`	`if (ldap_bind($conn, $this->user, $this->password) === false) {`
`113`		`- throw new Exception('Unable to connect to the Perun LDAP, ' . $this->hostname);`
	`113`	`+ throw new Exception('Unable to bind user to the Perun LDAP, ' . $this->hostname);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`Logger::debug("sspmod_perun_LdapConnector.search - Connection to Perun LDAP established. " .`