]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: rename variable for clarity
authorMark Houghton <mhoughton@microfocus.com>
Tue, 3 Nov 2020 15:14:06 +0000 (15:14 +0000)
committerMark Houghton <mhoughton@microfocus.com>
Fri, 20 Nov 2020 17:54:07 +0000 (17:54 +0000)
Signed-off-by: Mark Houghton <mhoughton@microfocus.com>
src/rgw/rgw_op.cc

index 85bb3fbf8d403667f4f4cb4c9586ee9c51735ab5..ed9cc20440eeea8bcdca127918fc32421704eefd 100644 (file)
@@ -6404,11 +6404,11 @@ int RGWDeleteMultiObj::verify_permission(optional_yield y)
       }
     }
 
-    bool empty = rgw::sal::RGWObject::empty(s->object.get()) || s->object->get_instance().empty();
+    bool not_versioned = rgw::sal::RGWObject::empty(s->object.get()) || s->object->get_instance().empty();
 
     auto usr_policy_res = eval_user_policies(s->iam_user_policies, s->env,
                                               boost::none,
-                                              empty ?
+                                              not_versioned ?
                                               rgw::IAM::s3DeleteObject :
                                               rgw::IAM::s3DeleteObjectVersion,
                                               ARN(s->bucket->get_key()));
@@ -6419,7 +6419,7 @@ int RGWDeleteMultiObj::verify_permission(optional_yield y)
     rgw::IAM::Effect r = Effect::Pass;
     if (s->iam_policy) {
       r = s->iam_policy->eval(s->env, *s->auth.identity,
-                                empty ?
+                                not_versioned ?
                                 rgw::IAM::s3DeleteObject :
                                 rgw::IAM::s3DeleteObjectVersion,
                                 ARN(s->bucket->get_key()));