keyring_init: g_conf.keyring is not a list

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 1fc60085548efe8a1caeb1ed3a54b7d10918aa03..7ce14fe6b39af68a826ad9331de03e5d44bd293b 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -64,16 +64,9 @@ void common_set_defaults(bool daemon)
 
 static void keyring_init(const char *filesearch)
 {
-  const char *filename = filesearch;
-  string keyring_search = g_conf.keyring;
-  string new_keyring;
-  if (ceph_resolve_file_search(keyring_search, new_keyring)) {
-    filename = new_keyring.c_str();
-  }
-
-  int ret = g_keyring.load(filename);
+  int ret = g_keyring.load(g_conf.keyring);
   if (ret) {
-    derr << "keyring_init: failed to load " << filename << dendl;
+    derr << "keyring_init: failed to load " << g_conf.keyring << dendl;
     return;
   }