From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Wed, 20 Apr 2016 13:04:40 +0000 (+0200)
Subject: rgw: drop req_state::os_auth_token as it isn't neccessary anymore.
X-Git-Tag: v11.0.0~283^2~18
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=99aac1549b38c3a481f177b6af6a5fe383add5e0;p=ceph.git

rgw: drop req_state::os_auth_token as it isn't neccessary anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index da4d897ed8427..022a36dbd1c0a 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -172,7 +172,7 @@ void req_info::rebuild_from(req_info& src)
 
 req_state::req_state(CephContext* _cct, RGWEnv* e, RGWUserInfo* u)
   : cct(_cct), cio(NULL), op(OP_UNKNOWN), user(u), has_acl_header(false),
-    os_auth_token(NULL), info(_cct, e)
+    info(_cct, e)
 {
   enable_ops_log = e->conf->enable_ops_log;
   enable_usage_log = e->conf->enable_usage_log;
@@ -191,7 +191,6 @@ req_state::req_state(CephContext* _cct, RGWEnv* e, RGWUserInfo* u)
 
   system_request = false;
 
-  os_auth_token = NULL;
   time = ceph_clock_now(cct);
   perm_mask = 0;
   bucket_instance_shard_id = -1;
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 206a118007c68..c4a95fc4d2b55 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -1298,8 +1298,6 @@ struct req_state {
 
   int prot_flags;
 
-  const char *os_auth_token;
-
   /* Content-Disposition override for TempURL of Swift API. */
   struct {
     string override;
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 996b247c6ad6c..afa7e2d9af2a2 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -1769,7 +1769,6 @@ int RGWHandler_REST_SWIFT::init_from_header(struct req_state *s)
     }
   }
 
-  s->os_auth_token = s->info.env->get("HTTP_X_AUTH_TOKEN");
   next_tok(req, first, '/');
 
   dout(10) << "ver=" << ver << " first=" << first << " req=" << req << dendl;