From: Matt Benjamin <mbenjamin@redhat.com>
Date: Tue, 11 Sep 2018 16:10:28 +0000 (-0400)
Subject: Merge pull request #21379 from pritha-srivastava/wip-rgw-user-policy
X-Git-Tag: v14.0.1~335
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c427b100c85d4aee9e978ed6f12fe8d105424826;p=ceph.git

Merge pull request #21379 from pritha-srivastava/wip-rgw-user-policy

rgw: User Policy
---

c427b100c85d4aee9e978ed6f12fe8d105424826
diff --cc src/rgw/rgw_common.cc
index 3cbcf411adde,2e17cac7bc00..963539403eb1
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@@ -95,8 -94,8 +95,9 @@@ rgw_http_errors rgw_http_s3_errors(
      { ERR_NO_SUCH_BUCKET_POLICY, {404, "NoSuchBucketPolicy"}},
      { ERR_NO_SUCH_USER, {404, "NoSuchUser"}},
      { ERR_NO_ROLE_FOUND, {404, "NoSuchEntity"}},
 +    { ERR_NO_CORS_FOUND, {404, "NoSuchCORSConfiguration"}},
      { ERR_NO_SUCH_SUBUSER, {404, "NoSuchSubUser"}},
+     { ERR_NO_SUCH_ENTITY, {404, "NoSuchEntity"}},
      { ERR_METHOD_NOT_ALLOWED, {405, "MethodNotAllowed" }},
      { ETIMEDOUT, {408, "RequestTimeout" }},
      { EEXIST, {409, "BucketAlreadyExists" }},
diff --cc src/rgw/rgw_common.h
index 7eee25636c47,82fd597409d5..ab0b61db7989
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@@ -217,11 -217,9 +217,11 @@@ using ceph::crypto::MD5
  #define ERR_MALFORMED_ACL_ERROR  2212
  #define ERR_ZONEGROUP_DEFAULT_PLACEMENT_MISCONFIGURATION 2213
  #define ERR_INVALID_ENCRYPTION_ALGORITHM                 2214
 +#define ERR_INVALID_CORS_RULES_ERROR                     2215
 +#define ERR_NO_CORS_FOUND        2216
  
  #define ERR_BUSY_RESHARDING      2300
- 
+ #define ERR_NO_SUCH_ENTITY       2301
  #ifndef UINT32_MAX
  #define UINT32_MAX (0xffffffffu)
  #endif