From 2fb6036aa53f5eb3173b80fd17b7240bd3daf156 Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Fri, 18 Feb 2011 09:51:32 -0800 Subject: [PATCH] keyring_init: g_conf.keyring is not a list Signed-off-by: Colin McCabe --- src/common/common_init.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/common/common_init.cc b/src/common/common_init.cc index 1fc60085548ef..7ce14fe6b39af 100644 --- 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; } -- 2.39.5