radosgw-admin: fix name checking

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 2af34bf8a02d90b5290b24d1b3bec47455951c98..04de7b32c4f518c9b8616a88f39972f49e8af188 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -3322,6 +3322,11 @@ int main(int argc, char **argv)
          zone.realm_id = realm.get_id();
        }
 
+       if( !zone_name.empty() && !zone.get_name().empty() && 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;
+       }
+
         if (zone.get_name().empty()) {
           zone.set_name(zone_name);
           if (zone.get_name().empty()) {
@@ -3330,11 +3335,6 @@ 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()) {