summaryrefslogtreecommitdiffstats
path: root/keystone/auth
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-08-16 17:34:56 +0000
committerGerrit Code Review <review@openstack.org>2013-08-16 17:34:56 +0000
commit81534a182a4986d838591395aee8590ef61c599d (patch)
tree94570b8b09e12a079085f85e4381a60175a93235 /keystone/auth
parentd695d4a3cd747ba47e2dfa1ca7e688175cbd06be (diff)
parent1ed2046eaa91fa36926d66a5fe1e88ccd65373bb (diff)
downloadkeystone-81534a182a4986d838591395aee8590ef61c599d.tar.gz
keystone-81534a182a4986d838591395aee8590ef61c599d.tar.xz
keystone-81534a182a4986d838591395aee8590ef61c599d.zip
Merge "Implement domain specific Identity backends"
Diffstat (limited to 'keystone/auth')
-rw-r--r--keystone/auth/plugins/password.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py
index 66c6d05b..b069f4d9 100644
--- a/keystone/auth/plugins/password.py
+++ b/keystone/auth/plugins/password.py
@@ -94,6 +94,7 @@ class UserAuthInfo(object):
self._assert_user_is_enabled(user_ref)
self.user_ref = user_ref
self.user_id = user_ref['id']
+ self.domain_id = domain_ref['id']
class Password(auth.AuthMethodHandler):
@@ -106,7 +107,8 @@ class Password(auth.AuthMethodHandler):
try:
self.identity_api.authenticate(
user_id=user_info.user_id,
- password=user_info.password)
+ password=user_info.password,
+ domain_scope=user_info.domain_id)
except AssertionError:
# authentication failed because of invalid username or password
msg = _('Invalid username or password')