]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix multi delete
authorYehuda Sadeh <yehuda@inktank.com>
Mon, 12 Aug 2013 17:05:44 +0000 (10:05 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Mon, 12 Aug 2013 21:31:05 +0000 (14:31 -0700)
Fixes: #5931
Backport: bobtail, cuttlefish

Fix a bad check, where we compare the wrong field. Instead of
comparing the ret code to 0, we compare the string value to 0
which generates implicit casting, hence the crash.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit f9f1c48ad799da2b4be0077bf9d61ae116da33d7)

Conflicts:
src/rgw/rgw_rest_s3.cc

src/rgw/rgw_rest_s3.cc

index 44dccbb0a6a53b4b82ab37dc2552bbc6135ba33f..2c09f6f712b26e18b8667a77f75b4f0b8d5d9b56 100644 (file)
@@ -1420,7 +1420,7 @@ void RGWDeleteMultiObj_ObjStore_S3::send_partial_response(pair<string,int>& resu
       s->formatter->open_object_section("Deleted");
       s->formatter->dump_string("Key", result.first);
       s->formatter->close_section();
-    } else if (result.first < 0) {
+    } else if (result.second < 0) {
       struct rgw_html_errors r;
       int err_no;