From: Orit Wasserman <owasserm@redhat.com>
Date: Sun, 1 Jan 2017 10:40:37 +0000 (+0200)
Subject: radosgw-admin: relam set can use input redirection
X-Git-Tag: v10.2.6~47^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4b6cf633a88dc7fcd48f9a4a54d10fea7bef7e2;p=ceph.git

radosgw-admin: relam set can use input redirection

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit b8b3ae3be3f8e4c05cb23062d25c701b15900475)

Conflicts:
	src/rgw/rgw_admin.cc ("return EINVAL" in master, "return -EINVAL" in
              jewel; but it's irrelevant because the whole block is deleted)
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 294d9e130b2c..c161db04a865 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2707,10 +2707,6 @@ int main(int argc, char **argv)
 	  cerr << "no realm name or id provided" << std::endl;
 	  return -EINVAL;
 	}
-        if (infile.empty()) {
-	  cerr << "no realm input file provided" << std::endl;
-	  return -EINVAL;
-        }
 	RGWRealm realm(realm_id, realm_name);
 	bool new_realm = false;
 	int ret = realm.init(g_ceph_context, store);