From b7708da905a3591bcbe5ab418f0ad92fb5c80966 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Mon, 11 Apr 2016 10:53:36 +0200 Subject: [PATCH] radosgw-admin: fix name checking Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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()) { -- 2.47.3