From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 23 Mar 2018 17:24:35 +0000 (-0700)
Subject: rgw: require mfa only if mfa status actually changes
X-Git-Tag: v13.1.0~343^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46fbc9089b569bbc36df2bc0aa80c61ec5acb88a;p=ceph.git

rgw: require mfa only if mfa status actually changes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 12eb7116d0d8..7b83e637055a 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -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;