]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: zone set add a check for zone name in json
authorOrit Wasserman <owasserm@redhat.com>
Tue, 1 Dec 2015 08:04:06 +0000 (09:04 +0100)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:13:39 +0000 (16:13 -0800)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_admin.cc

index e2f1a2d2066776193eeee51e6dea0792dd11b7cc..743273785cab313c312539bce62f9ad8ff959dc4 100644 (file)
@@ -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()) {