From 69130d7cc518e654080c2f32f6431930c45400e0 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Tue, 22 May 2012 10:16:42 -0700
Subject: [PATCH] monclient: move keyring requirement where it belongs

Signed-off-by: Sage Weil <sage@inktank.com>
---
 src/auth/KeyRing.cc  |  9 ---------
 src/mon/MonClient.cc | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index 72e84fcd483..8b636878c75 100644
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -38,15 +38,6 @@ int KeyRing::from_ceph_context(CephContext *cct, KeyRing *keyring)
 {
   const md_config_t *conf = cct->_conf;
 
-  AuthMethodList supported(cct,
-			   cct->_conf->auth_client_required.length() ?
-			   cct->_conf->auth_client_required : cct->_conf->auth_supported);
-
-  if (!supported.is_supported_auth(CEPH_AUTH_CEPHX)) {
-    ldout(cct, 2) << "CephX auth is not supported." << dendl;
-    return 0;
-  }
-
   int ret = 0;
   string filename;
   if (ceph_resolve_file_search(conf->keyring, filename)) {
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 01802fdfea4..095a38aff71 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -259,16 +259,33 @@ int MonClient::init()
 
   messenger->add_dispatcher_head(this);
 
+  entity_name = cct->_conf->name;
+
+  // keyring
   keyring = new KeyRing;
   int r = KeyRing::from_ceph_context(cct, keyring);
+  if (r == -ENOENT) {
+    // do we care?
+    string method;
+    if (entity_name.get_type() == CEPH_ENTITY_TYPE_MDS ||
+	entity_name.get_type() == CEPH_ENTITY_TYPE_OSD)
+      method = cct->_conf->auth_cluster_required;
+    else
+      method = cct->_conf->auth_client_required;
+    if (method.length() == 0)
+      method = cct->_conf->auth_supported;
+    AuthMethodList supported(cct, method);
+    if (!supported.is_supported_auth(CEPH_AUTH_CEPHX)) {
+      ldout(cct, 2) << "cephx auth is not supported, ignoring absence of keyring" << dendl;
+      r = 0;
+    }
+  }
   if (r < 0) {
     lderr(cct) << "failed to open keyring: " << cpp_strerror(r) << dendl;
     return r;
   }
   rotating_secrets = new RotatingKeyRing(cct, cct->get_module_type(), keyring);
 
-  entity_name = cct->_conf->name;
-  
   Mutex::Locker l(monc_lock);
   timer.init();
   finisher.start();