wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return an empty array on succesful existence check

Browse source
This commit is contained in:
Lorenzo M. Catucci 2012-11-05 17:35:09 +01:00
parent 510191db68
commit ca24f4767b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/user_ldap/lib/access.php
View file

@ -41,7 +41,8 @@ abstract class Access {
* @param $dn the record in question
* @param $attr the attribute that shall be retrieved
* if empty, just check the record's existence
* @returns true or the values in an array on success, false otherwise
* @returns an array of values on success or an empty
* array if $attr is empty, false otherwise
*
* Reads an attribute from an LDAP entry or check if entry exists
*/
@ -64,7 +65,7 @@ abstract class Access {
}
if (empty($attr)) {
\OCP\Util::writeLog('user_ldap', 'readAttribute: '.$dn.' found', \OCP\Util::DEBUG);
return true;
return array();
}
$er = ldap_first_entry($cr, $rr);
if(!is_resource($er)) {

2
apps/user_ldap/user_ldap.php
View file

@ -150,7 +150,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
}
//check if user really still exists by reading its entry
if(!$this->readAttribute($dn, '') ) {
if(!is_array($this->readAttribute($dn, ''))) {
$this->connection->writeToCache('userExists'.$uid, false);
return false;
}