From: Yehuda Sadeh <yehuda@redhat.com>
Date: Sun, 8 Dec 2019 11:08:46 +0000 (-0800)
Subject: rgw: list buckets: don't return buckets if limit=0
X-Git-Tag: v15.1.0~603^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=857fdfb8e07bcd77869511e1d239b1651e85d7be;p=ceph.git

rgw: list buckets: don't return buckets if limit=0

Fixes: https://tracker.ceph.com/issues/42868

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index ef6e7b0d9bd..69faf288eb4 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2363,7 +2363,8 @@ void RGWListBuckets::execute()
       started = true;
     }
 
-    if (!m.empty()) {
+    if (read_count > 0 &&
+        !m.empty()) {
       map<string, rgw::sal::RGWBucket*>::reverse_iterator riter = m.rbegin();
       marker = riter->first;