update sources to v12.1.2

[ceph.git] / ceph / src / mon / MonCap.h

diff --git a/ceph/src/mon/MonCap.h b/ceph/src/mon/MonCap.h
index 46acb1e42b5fae68319ae1b10479a3ac42cb0398..1ff4b831ed1de428273145cff396529d006ca096 100644 (file)
--- a/ceph/src/mon/MonCap.h
+++ b/ceph/src/mon/MonCap.h
@@ -35,12 +35,20 @@ struct mon_rwxa_t {
 ostream& operator<<(ostream& out, const mon_rwxa_t& p);
 
 struct StringConstraint {
+  enum MatchType {
+    MATCH_TYPE_NONE,
+    MATCH_TYPE_EQUAL,
+    MATCH_TYPE_PREFIX,
+    MATCH_TYPE_REGEX
+  };
+
+  MatchType match_type = MATCH_TYPE_NONE;
   string value;
-  string prefix;
 
   StringConstraint() {}
-  StringConstraint(string a, string b)
-    : value(std::move(a)), prefix(std::move(b)) {}
+  StringConstraint(MatchType match_type, string value)
+    : match_type(match_type), value(value) {
+  }
 };
 
 ostream& operator<<(ostream& out, const StringConstraint& c);