From: Jesse F. Williamson <jfw@ibm.com>
Date: Wed, 26 Feb 2025 21:48:26 +0000 (-0800)
Subject: Restore rgw_token
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97c38d654c8c0b7e00836ac985f04e00b709cb60;p=ceph.git

Restore rgw_token

Signed-off-by: Jesse F. Williamson <jfw@ibm.com>
---

diff --git a/src/common/ceph_json.h b/src/common/ceph_json.h
index ba4f07e620b..547076d4650 100644
--- a/src/common/ceph_json.h
+++ b/src/common/ceph_json.h
@@ -318,7 +318,7 @@ public:
 };
 
 template <typename IntegerT>
-requires ceph_json::detail::json_integer<IntegerT> ||
+requires ceph_json::detail::json_integer<IntegerT> 
 void decode_json_obj(IntegerT& val, JSONObj *obj)
 {
  auto r = ceph::parse<IntegerT>(obj->get_data());
diff --git a/src/rgw/rgw_token.h b/src/rgw/rgw_token.h
index 3bf9adaf00b..b2476596bec 100644
--- a/src/rgw/rgw_token.h
+++ b/src/rgw/rgw_token.h
@@ -82,13 +82,13 @@ namespace rgw {
 
     explicit RGWToken(const string& json) {
       JSONParser p;
-      p.parse(json);
+      p.parse(json.c_str(), json.length());
       JSONDecoder::decode_json(RGWToken::type_name, *this, &p);
     }
 
     RGWToken& operator=(const std::string& json) {
       JSONParser p;
-      p.parse(json);
+      p.parse(json.c_str(), json.length());
       JSONDecoder::decode_json(RGWToken::type_name, *this, &p);
       return *this;
     }