mirror of
https://github.com/YunoHost-Apps/dotclear2_ynh.git
synced 2024-09-03 18:26:29 +02:00
A better fix for case sensitivity
This commit is contained in:
parent
f2b7228a4a
commit
00951cdaf7
1 changed files with 6 additions and 4 deletions
|
@ -22,9 +22,6 @@ class ldapDcAuth extends dcAuth
|
||||||
ldap_set_option ($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
|
ldap_set_option ($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
|
||||||
if (ldap_bind($ds, "uid=".$user_id.",ou=users,".$this->base, $pwd))
|
if (ldap_bind($ds, "uid=".$user_id.",ou=users,".$this->base, $pwd))
|
||||||
{
|
{
|
||||||
# user_id needs to be in lowercase here
|
|
||||||
$user_id = strtolower($user_id);
|
|
||||||
|
|
||||||
# search the user in ldap, and get infos
|
# search the user in ldap, and get infos
|
||||||
$filter = "(&(|(objectclass=posixAccount))(uid=".$user_id.")(permission=cn=__APP__.admin,ou=permission,".$this->base."))";
|
$filter = "(&(|(objectclass=posixAccount))(uid=".$user_id.")(permission=cn=__APP__.admin,ou=permission,".$this->base."))";
|
||||||
$sr = ldap_search($ds, $this->base, $filter, array("dn", "cn", "sn", "mail", "givenname")); # /!\ fields have to be in lowercase
|
$sr = ldap_search($ds, $this->base, $filter, array("dn", "cn", "sn", "mail", "givenname")); # /!\ fields have to be in lowercase
|
||||||
|
@ -32,6 +29,11 @@ class ldapDcAuth extends dcAuth
|
||||||
|
|
||||||
if ($info["count"] == 1)
|
if ($info["count"] == 1)
|
||||||
{
|
{
|
||||||
|
# To be case sensitive
|
||||||
|
if ($info[0]['dn'] != "uid=".$user_id.",ou=users,".$this->base) {
|
||||||
|
return parent::checkUser($user_id, $pwd);
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
$this->con->begin();
|
$this->con->begin();
|
||||||
|
|
Loading…
Reference in a new issue