From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 16 Oct 2017 14:51:47 +0000 (+0200)
Subject: rgw: policy: support for acl grants cond. in bucket acls as well
X-Git-Tag: v13.0.2~246^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9aed1edc982d0f430a6511939780723ed9a6d839;p=ceph.git

rgw: policy: support for acl grants cond. in bucket acls as well

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 9aa180682764..d74a70c2b589 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4713,9 +4713,9 @@ int RGWPutACLs::verify_permission()
     rgw_add_to_iam_environment(s->env, "s3:x-amz-acl", s->canned_acl);
   }
 
+  rgw_add_grant_to_iam_environment(s->env, s);
   if (!s->object.empty()) {
     auto iam_action = s->object.instance.empty() ? rgw::IAM::s3PutObjectAcl : rgw::IAM::s3PutObjectVersionAcl;
-    rgw_add_grant_to_iam_environment(s->env, s);
     auto obj = rgw_obj(s->bucket, s->object);
     op_ret = rgw_iam_add_existing_objtags(store, s, obj, iam_action);
     perm = verify_object_permission(s, iam_action);