mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge PR #813 branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
This commit is contained in:
Oleg Pudeyev
2012-05-21 22:35:54 -04:00
parent 44b3ab102a a97ebe78bf
commit 6f6cf20d61
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/auth/auth_ldap.php
View File

@@ -155,7 +155,11 @@ function login_ldap(&$username, &$password)
{ {
if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password']))) if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
{ {
return $user->lang['LDAP_NO_SERVER_CONNECTION']; return array(
'status' => LOGIN_ERROR_EXTERNAL_AUTH,
'error_msg' => 'LDAP_NO_SERVER_CONNECTION',
'user_row' => array('user_id' => ANONYMOUS),
);
} }
} }