From: Matt Benjamin <mbenjamin@redhat.com>
Date: Fri, 15 Jul 2022 00:04:20 +0000 (-0400)
Subject: rgwlc:  count LCFilter flags towards multi-condition
X-Git-Tag: v18.0.0~475^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f9928dd87ea7be2050afc146654e1dc83e2b1d26;p=ceph-ci.git

rgwlc:  count LCFilter flags towards multi-condition

Found by Soumya Koduri <skoduri@redhat.com>

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_lc.h b/src/rgw/rgw_lc.h
index 3cf3931fdeb..e08877a3513 100644
--- a/src/rgw/rgw_lc.h
+++ b/src/rgw/rgw_lc.h
@@ -223,7 +223,7 @@ public:
 
   // Determine if we need AND tag when creating xml
   bool has_multi_condition() const {
-    if (obj_tags.count() + int(has_prefix()) > 1) // Prefix is a member of Filter
+    if (obj_tags.count() + int(has_prefix()) + int(has_flags()) > 1) // Prefix is a member of Filter
       return true;
     return false;
   }