summaryrefslogtreecommitdiffstats
path: root/keystone/identity
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-17 16:04:13 +0000
committerGerrit Code Review <review@openstack.org>2013-06-17 16:04:13 +0000
commitdcddfbccf35d3950ab58b4b9e8129fa91a722410 (patch)
tree71343dd22ad4f8f5e14d31ccf46c8ff7fe75a401 /keystone/identity
parent3c687d17016cb8efcfdce2de0d2f923121917fcb (diff)
parent61c72f73424c47d21e533b0bdde997f6e0a4de45 (diff)
downloadkeystone-dcddfbccf35d3950ab58b4b9e8129fa91a722410.tar.gz
keystone-dcddfbccf35d3950ab58b4b9e8129fa91a722410.tar.xz
keystone-dcddfbccf35d3950ab58b4b9e8129fa91a722410.zip
Merge "LDAP get_project_users should not return password"
Diffstat (limited to 'keystone/identity')
-rw-r--r--keystone/identity/backends/ldap/core.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
index 89ecd06e..07cd83b6 100644
--- a/keystone/identity/backends/ldap/core.py
+++ b/keystone/identity/backends/ldap/core.py
@@ -171,7 +171,11 @@ class Identity(identity.Driver):
def get_project_users(self, tenant_id):
self.get_project(tenant_id)
- return self._set_default_domain(self.project.get_users(tenant_id))
+ user_refs = self.project.get_users(tenant_id)
+ users = []
+ for user_ref in user_refs:
+ users.append(identity.filter_user(user_ref))
+ return self._set_default_domain(users)
def get_roles_for_user_and_project(self, user_id, tenant_id):
self.get_user(user_id)