diff options
Diffstat (limited to 'apps/user_ldap/lib/user')
| -rw-r--r-- | apps/user_ldap/lib/user/iusertools.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/user/manager.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/user/iusertools.php b/apps/user_ldap/lib/user/iusertools.php index e409f3afed3..bbc678153de 100644 --- a/apps/user_ldap/lib/user/iusertools.php +++ b/apps/user_ldap/lib/user/iusertools.php @@ -33,6 +33,8 @@ interface IUserTools { public function readAttribute($dn, $attr, $filter = 'objectClass=*'); + public function stringResemblesDN($string); + public function dn2username($dn, $ldapname = null); public function username2dn($name); diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php index 0f17900b5f3..0ed3d09c48f 100644 --- a/apps/user_ldap/lib/user/manager.php +++ b/apps/user_ldap/lib/user/manager.php @@ -143,8 +143,7 @@ class Manager { return $this->users['byUid'][$id]; } - if(strpos(mb_strtolower($id, 'UTF-8'), 'dc=') === false - && strpos(mb_strtolower($id, 'UTF-8'), 'uid=') === false ) { + if(!$this->access->stringResemblesDN($id) ) { //most likely a uid $dn = $this->access->username2dn($id); if($dn !== false) { |