]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix json decoding for swift keys
authorYehuda Sadeh <yehuda@inktank.com>
Thu, 6 Jun 2013 20:44:47 +0000 (13:44 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Mon, 10 Jun 2013 21:28:03 +0000 (14:28 -0700)
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
src/rgw/rgw_json_enc.cc

index fa155043fd1bd7f47f74b334a06c141a5fc5dd9c..7b807a3e3bb7907ad62e3651c2c4fa7a528df476 100644 (file)
@@ -238,11 +238,10 @@ void RGWAccessKey::decode_json(JSONObj *obj, bool swift) {
   }
 
   if (!JSONDecoder::decode_json("subuser", subuser, obj)) {
-    string user;
-    JSONDecoder::decode_json("user", user, obj, true);
-    int pos = user.find(':');
+    JSONDecoder::decode_json("user", id, obj, true);
+    int pos = id.find(':');
     if (pos >= 0) {
-      subuser = user.substr(pos + 1);
+      subuser = id.substr(pos + 1);
     }
   }
   JSONDecoder::decode_json("secret_key", key, obj, true);