summaryrefslogtreecommitdiffstats
path: root/gluster/swift
diff options
context:
space:
mode:
Diffstat (limited to 'gluster/swift')
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/middleware.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
index 996228d..bc5d085 100644
--- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py
+++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
@@ -386,7 +386,7 @@ class Swauth(object):
user_groups = (req.remote_user or '').split(',')
if '.reseller_admin' in user_groups and \
account != self.reseller_prefix and \
- account[len(self.reseller_prefix):] != 'gsmetadata':
+ account[len(self.reseller_prefix):] != self.metadata_volume:
req.environ['swift_owner'] = True
return None
if account in user_groups and \
@@ -1357,7 +1357,8 @@ class Swauth(object):
memcache_client.set(
memcache_key,
(self.itoken_expires,
- '.auth,.reseller_admin,%s.auth' % self.reseller_prefix),
+ '%s,.reseller_admin,%s' % (self.metadata_volume,
+ self.auth_account)),
timeout=self.token_life)
return self.itoken