]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: require mfa only if mfa status actually changes
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 23 Mar 2018 17:24:35 +0000 (10:24 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 9 Apr 2018 14:02:17 +0000 (07:02 -0700)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_op.cc

index 12eb7116d0d88443b708ca40e748a15beef42595..7b83e637055a1b36791e7fcf7aaec1c43d92f57e 100644 (file)
@@ -2171,6 +2171,10 @@ void RGWSetBucketVersioning::execute()
   if (op_ret < 0)
     return;
 
+  bool cur_mfa_status = (s->bucket_info.flags & BUCKET_MFA_ENABLED) != 0;
+
+  mfa_set_status &= (mfa_status != cur_mfa_status);
+
   if (mfa_set_status &&
       !s->mfa_verified) {
     op_ret = -ERR_MFA_REQUIRED;