]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: check for valid input in zone delete command
authorOrit Wasserman <owasserm@redhat.com>
Wed, 14 Oct 2015 13:55:44 +0000 (15:55 +0200)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:13:10 +0000 (16:13 -0800)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_admin.cc

index 9a0b415395398b5e13c06f3ced6f9f365c8848fe..bae83049ba6fe7386dc988e3ae2ce6eeeb719175 100644 (file)
@@ -2742,6 +2742,11 @@ int main(int argc, char **argv)
       break;
    case OPT_ZONE_DELETE:
       {
+       if (zonegroup_id.empty() && zonegroup_name.empty()) {
+         cerr << "no zonegroup name or id provided" << std::endl;
+         return -EINVAL;
+       }
+
        RGWZoneGroup zonegroup(zonegroup_id,zonegroup_name);
        int ret = zonegroup.init(g_ceph_context, store);
        if (ret < 0) {