summaryrefslogtreecommitdiffstats
path: root/keystone/token/controllers.py
diff options
context:
space:
mode:
Diffstat (limited to 'keystone/token/controllers.py')
-rw-r--r--keystone/token/controllers.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py
index 4914d305..7a5b9be3 100644
--- a/keystone/token/controllers.py
+++ b/keystone/token/controllers.py
@@ -262,6 +262,11 @@ class Auth(controller.V2Controller):
if 'REMOTE_USER' not in context:
raise ExternalAuthNotApplicable()
+ #NOTE(jamielennox): xml and json differ and get confused about what
+ # empty auth should look like so just reset it.
+ if not auth:
+ auth = {}
+
username = context['REMOTE_USER']
try:
user_ref = self.identity_api.get_user_by_name(