diff options
| author | Jose Castro Leon <jose.castro.leon@cern.ch> | 2012-09-17 19:22:14 +0200 |
|---|---|---|
| committer | Jose Castro Leon <jose.castro.leon@cern.ch> | 2012-09-17 19:22:14 +0200 |
| commit | 1e599f92ac9172c82cdae33d120d6dd5398ba42b (patch) | |
| tree | c776cf00ba008f9fd57247516ea62f358fd67305 /keystone/identity | |
| parent | f261f718eebdfc60cdf9ce1f227c43f462dc163c (diff) | |
| download | keystone-1e599f92ac9172c82cdae33d120d6dd5398ba42b.tar.gz keystone-1e599f92ac9172c82cdae33d120d6dd5398ba42b.tar.xz keystone-1e599f92ac9172c82cdae33d120d6dd5398ba42b.zip | |
Updated Fix for duplicated entries on LDAP backend for get_tenant_users
Fixes bug 1050406
Change-Id: I74735c6c6094d3e57adea26e5035d19c318f73b3
Diffstat (limited to 'keystone/identity')
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 03d3ab61..07ff506e 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -556,20 +556,20 @@ class TenantApi(common_ldap.BaseLdap, ApiShimMixin): def get_users(self, tenant_id, role_id=None): tenant = self._ldap_get(tenant_id) - res = [] + res = set() if not role_id: # Get users who have default tenant mapping for user_dn in tenant[1].get(self.member_attribute, []): if self.use_dumb_member and user_dn == self.DUMB_MEMBER_DN: continue - res.append(self.user_api.get(self.user_api._dn_to_id(user_dn))) + res.add(self.user_api.get(self.user_api._dn_to_id(user_dn))) # Get users who are explicitly mapped via a tenant rolegrants = self.role_api.get_role_assignments(tenant_id) for rolegrant in rolegrants: if role_id is None or rolegrant.role_id == role_id: - res.append(self.user_api.get(rolegrant.user_id)) - return res + res.add(self.user_api.get(rolegrant.user_id)) + return list(res) def delete(self, id): super(TenantApi, self).delete(id) |