From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 21 Aug 2017 11:08:52 +0000 (+0200)
Subject: rgw: drop requestobject tag from gperf and keywords
X-Git-Tag: v13.0.2~246^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc9f7edd7285deb203e613fcc77b593d8d51edce;p=ceph.git

rgw: drop requestobject tag from gperf and keywords

Since these are dropped at compile time anyway

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_iam_policy_keywords.gperf b/src/rgw/rgw_iam_policy_keywords.gperf
index cc84fb72c233..57a732c02fb3 100644
--- a/src/rgw/rgw_iam_policy_keywords.gperf
+++ b/src/rgw/rgw_iam_policy_keywords.gperf
@@ -109,7 +109,6 @@ Null, TokenKind::cond_op, TokenID::Null, (uint64_t) Type::null, true, true
 #s3:authType, TokenKind::cond_key, TokenID::s3authType, (uint64_t) Type::string, true, false
 #s3:signatureAge, TokenKind::cond_key, TokenID::s3signatureAge, (uint64_t) Type::number, true, false
 #s3:x-amz-content-sha256, TokenKind::cond_key, TokenID::s3x_amz_content_sha256, (uint64_t) Type::string, true, false
-#s3:RequestObjectTag, TokenKind::cond_key, TokenID::s3RequestObjectTag, (uint64_t) Type::string, true, false
 #
 # Version Keywords
 #
diff --git a/src/rgw/rgw_iam_policy_keywords.h b/src/rgw/rgw_iam_policy_keywords.h
index 9ce06de54096..a0cd34b6286e 100644
--- a/src/rgw/rgw_iam_policy_keywords.h
+++ b/src/rgw/rgw_iam_policy_keywords.h
@@ -87,7 +87,6 @@ enum class TokenID {
   s3authType,
   s3signatureAge,
   s3x_amz_content_sha256,
-  s3RequestObjectTag,
 #else
   CondKey,
 #endif