summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-09-19 10:41:07 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-09-19 10:41:07 -0700
commitf22ef1e65977b86d90f990bceecdda5c06d36fe8 (patch)
tree1e6860a29e15596b6ec7655991f8226794fced92
parent8d41d3f8968f6f6a2ddbe868ac370edce81996fb (diff)
downloadceph-f22ef1e65977b86d90f990bceecdda5c06d36fe8.tar.gz
radosgw-admin: check params for object rewrite
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r--src/rgw/rgw_admin.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 1e0532935eb..58b83790d97 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1762,12 +1762,20 @@ next:
}
if (opt_cmd == OPT_OBJECT_REWRITE) {
+ if (bucket_name.empty()) {
+ cerr << "ERROR: bucket not specified" << std::endl;
+ return EINVAL;
+ }
+ if (object.empty()) {
+ cerr << "ERROR: object not specified" << std::endl;
+ return EINVAL;
+ }
rgw_obj obj(bucket, object);
int ret = store->rewrite_obj(obj);
if (ret < 0) {
cerr << "ERROR: object remove returned: " << cpp_strerror(-ret) << std::endl;
- return 1;
+ return -ret;
}
}