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 9aa1806827646fbdde6cd01572a0839ab2054485..d74a70c2b589104ae9df5d17bc6159e5f3b460f8 100644 (file)
--- 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);