From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 11 Apr 2016 08:53:36 +0000 (+0200)
Subject: radosgw-admin: fix name checking
X-Git-Tag: v10.1.2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8529%2Fhead;p=ceph.git

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 2af34bf8a02d..04de7b32c4f5 100644
--- 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()) {