diff options
| author | Guang Yee <guang.yee@hp.com> | 2013-03-18 17:18:22 -0700 |
|---|---|---|
| committer | Guang Yee <guang.yee@hp.com> | 2013-03-18 17:19:38 -0700 |
| commit | 75637be4bc160f25b130690e6d31ee3a66522ce6 (patch) | |
| tree | f42d30c04bea0c5b51212b3dbba86f7fe539ba67 /keystone/auth | |
| parent | 1a0dd5515f19a3a8db2ed5d929e2e682a15beccb (diff) | |
| download | keystone-75637be4bc160f25b130690e6d31ee3a66522ce6.tar.gz keystone-75637be4bc160f25b130690e6d31ee3a66522ce6.tar.xz keystone-75637be4bc160f25b130690e6d31ee3a66522ce6.zip | |
V2, V3 token intermix for unscoped tokens (bug 1156913)
Make sure we check for tenant_ref before referencing it.
Change-Id: If7918c0a9b2e99f8555e902e89166c6542105209
Diffstat (limited to 'keystone/auth')
| -rw-r--r-- | keystone/auth/token_factory.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/auth/token_factory.py b/keystone/auth/token_factory.py index 0ec2fe28..3d4d38b2 100644 --- a/keystone/auth/token_factory.py +++ b/keystone/auth/token_factory.py @@ -228,7 +228,7 @@ def recreate_token_data(context, token_data=None, expires=None, methods = token_data['methods'] extras = token_data['extras'] else: - project_id = project_ref['id'] + project_id = project_ref['id'] if project_ref else None user_id = user_ref['id'] token_data_helper = TokenDataHelper(context) return token_data_helper.get_token_data(user_id, |