fix typos

2 files changed, 2 insertions, 2 deletions

diff --git a/keystone/logic/service.py b/keystone/logic/service.py
index ad667b3c..cd0b5237 100644
--- a/keystone/logic/service.py
+++ b/keystone/logic/service.py
@@ -210,7 +210,7 @@ class IDMService(object):
         if admin:
             for ug in user.groups:
                 if ug.group_id == "Admin":
-                    return auth_data
+                    return (token, user)
             raise fault.ForbiddenFault("You are not authorized "
                                        "to make this call")
         return (token, user)
diff --git a/keystone/logic/types/auth.py b/keystone/logic/types/auth.py
index 755c80aa..69f285d3 100644
--- a/keystone/logic/types/auth.py
+++ b/keystone/logic/types/auth.py
@@ -118,7 +118,7 @@ class AuthData(object):
                              xmlns="http://docs.openstack.org/idm/api/v1.0")
         token = etree.Element("token",
                              expires=self.token.expires.isoformat())
-        token.set("id", self.__token.token_id)
+        token.set("id", self.token.token_id)
         user = etree.Element("user",
                              username=self.user.username,
                              tenantId=self.user.tenant_id)