From f267df2f9c019678e2b1d836a681e42038b838ee Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Wed, 14 Oct 2015 15:47:19 +0200 Subject: [PATCH] radosgw-admin: check legal input for zone modify command Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index de0dea3cdadc1..44bd31cf951c5 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2828,6 +2828,16 @@ int main(int argc, char **argv) break; case OPT_ZONE_MODIFY: { + if (zone_id.empty() && zone_name.empty()) { + cerr << "no zone name or id provided" << std::endl; + return -EINVAL; + } + + if (zonegroup_id.empty() && zonegroup_name.empty()) { + cerr << "no zonegroup name or id provided" << std::endl; + return -EINVAL; + } + RGWZoneParams zone(zone_id, zone_name); int ret = zone.init(g_ceph_context, store); if (ret < 0) { -- 2.39.5