diff options
| -rw-r--r-- | apps/user_ldap/lib/access.php | 5 | ||||
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 822e0b441c0..9cbb21ead0e 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -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)) { diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 4c0893a5103..6591d1d5fee 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -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; } |