From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 14 Oct 2015 13:55:44 +0000 (+0200)
Subject: radosgw-admin: check for valid input in zone delete command
X-Git-Tag: v10.1.0~354^2~367
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9638a4eec72e0ec2d5bdbbd25bac1c4e07e98697;p=ceph.git

radosgw-admin: check for valid input in zone delete command

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 9a0b41539539..bae83049ba6f 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -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) {