From: Yehuda Sadeh <yehuda@inktank.com>
Date: Mon, 12 Aug 2013 17:05:44 +0000 (-0700)
Subject: rgw: fix multi delete
X-Git-Tag: v0.61.8~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6be5ed2601b8cf45570afe7ca75ce5aba3f8b4f;p=ceph.git

rgw: fix multi delete

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
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 38fab1bd2c1..a88d2a36da7 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1509,7 +1509,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;