tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-19 Ramon Novoa <rnovoa@artica.es> 

* include/auth/ldap.php: Do not bind anonymously to check whether the
	  user exists.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7681 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-02-19 17:16:46 +00:00
parent 8a9bb86959
commit cdc431f8b8
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-02-19 Ramon Novoa <rnovoa@artica.es>
* include/auth/ldap.php: Do not bind anonymously to check whether the
user exists.
2013-02-19 Miguel de Dios <miguel.dedios@artica.es> 2013-02-19 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_command.php, * godmode/alerts/configure_alert_command.php,

15
pandora_console/include/auth/ldap.php
View File

@ -364,19 +364,12 @@ function ldap_valid_login ($login, $password) {
return $ret; return $ret;
} }
if (ldap_search_user ($login)) { $r = @ldap_bind ($ds, $config["auth"]["ldap_login_attr"]."=".$login.",".$config["auth"]["ldap_base_dn"], $password);
$r = @ldap_bind ($ds, $config["auth"]["ldap_login_attr"]."=".$login.",".$config["auth"]["ldap_base_dn"], $password); if (!$r) {
if (!$r) { $ldap_cache["error"] .= 'Invalid login';
$ldap_cache["error"] .= 'Invalid login';
//$ldap_cache["error"] .= ': incorrect password'; // uncomment for debugging
}
else {
$ret = true;
}
} }
else { else {
$ldap_cache["error"] .= 'Invalid login'; $ret = true;
//$ldap_cache["error"] .= ': no such user';
} }
@ldap_close ($ds); @ldap_close ($ds);
} }