]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: check for name mistmatch in realm set 13182/head
authorOrit Wasserman <owasserm@redhat.com>
Sun, 1 Jan 2017 10:56:44 +0000 (12:56 +0200)
committerNathan Cutler <ncutler@suse.com>
Sun, 29 Jan 2017 11:35:45 +0000 (12:35 +0100)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 4facc5f4f3e842d371115a9a04d86257280014f0)

src/rgw/rgw_admin.cc

index c161db04a86562d041f101734c1184a2e8ebe0eb..8ac78b0d1f903d93640b1157009ce475a92e4d24 100644 (file)
@@ -2720,6 +2720,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;