From c12b30f7a2a6fe05e826e827cd6c610f1fa728ec Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 19 Mar 2013 11:52:35 +0100 Subject: [PATCH] LDAP: check first whether group exists in this backend before doing other operations --- apps/user_ldap/group_ldap.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index efa5f8b4fe3..3dbc5e7d895 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -139,6 +139,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { if(!$this->enabled) { return array(); } + if(!$this->groupExists($gid)) { + return false; + } $cachekey = 'usersInGroup-'.$gid.'-'.$search.'-'.$limit.'-'.$offset; // check for cache of the exact query $groupUsers = $this->connection->getFromCache($cachekey); @@ -214,6 +217,12 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { * @returns array with display names (value) and user ids(key) */ public function displayNamesInGroup($gid, $search, $limit, $offset) { + if(!$this->enabled) { + return array(); + } + if(!$this->groupExists($gid)) { + return false; + } $users = $this->usersInGroup($gid, $search, $limit, $offset); $displayNames = array(); foreach($users as $user) { -- 2.39.5