From: Orit Wasserman <owasserm@redhat.com>
Date: Tue, 1 Dec 2015 08:04:06 +0000 (+0100)
Subject: radosgw-admin: zone set add a check for zone name in json
X-Git-Tag: v10.1.0~354^2~165
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efe8d9d4927aa6ff3e655261734e0fcb351a6e5e;p=ceph.git

radosgw-admin: zone set add a check for zone name in json

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index e2f1a2d20667..743273785cab 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2805,6 +2805,11 @@ int main(int argc, char **argv)
           }
         }
 
+	if(zone.get_name() != zone_name) {
+	  cerr << "Error: zone name" << zone_name << " is different than the zone name " << zone.get_name() << " in the provided json " << std::endl;
+	  return -EINVAL;
+	}
+
         zone_name = zone.get_name();
 
         if (zone.get_id().empty()) {