From: Orit Wasserman <owasserm@redhat.com>
Date: Sun, 1 Jan 2017 10:56:44 +0000 (+0200)
Subject: radosgw-admin: check for name mistmatch in realm set
X-Git-Tag: v12.0.0~252^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12731%2Fhead;p=ceph.git

radosgw-admin: check for name mistmatch in realm set

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 672bb3f7a116..594fdc62f43b 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -3116,6 +3116,11 @@ int main(int argc, char **argv)
 	if (ret < 0) {
 	  return 1;
 	}
+	if (!realm_name.empty() && realm.get_name() != realm_name) {
+	  cerr << "mismatch between --rgw-realm " << realm_name << " and json input file name " <<
+	    realm.get_name() << std::endl;
+	  return EINVAL;
+	}
 	/* new realm */
 	if (new_realm) {
 	  cout << "clearing period and epoch for new realm" << std::endl;