From: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
Date: Fri, 15 Jan 2021 00:44:03 +0000 (+0800)
Subject: rgw: fix sts get_session_token always failed because of wrong
X-Git-Tag: v15.2.13~2^2~16^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac3e282660a0a767dc83d14a872fd76cd1de299a;p=ceph.git

rgw: fix sts get_session_token always failed because of wrong
check

fix https://tracker.ceph.com/issues/48883

Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
(cherry picked from commit bf9c66e16dfc704c3471f42d9f6b9b1682f9969e)

Conflicts:
	src/rgw/rgw_rest_sts.cc
- d6af250bff08d54cd37121666c26b475d5d2cf52 was not backported
---

diff --git a/src/rgw/rgw_rest_sts.cc b/src/rgw/rgw_rest_sts.cc
index 729c61e2e515f..e23fd10da59d2 100644
--- a/src/rgw/rgw_rest_sts.cc
+++ b/src/rgw/rgw_rest_sts.cc
@@ -412,8 +412,9 @@ int RGWSTSGetSessionToken::get_params()
     }
 
     if (duration_in_secs < STS::GetSessionTokenRequest::getMinDuration() ||
-            duration_in_secs > s->cct->_conf->rgw_sts_max_session_duration)
+            duration_in_secs > s->cct->_conf->rgw_sts_max_session_duration) {
       return -EINVAL;
+    }
   }
 
   return 0;