RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 23:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

monclient: move keyring requirement where it belongs

Browse Source 
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-05-22 10:16:42 -07:00
parent 35e79f233e
commit 69130d7cc5
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/auth/KeyRing.cc
View File

@ -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)) {

21
src/mon/MonClient.cc
View File

@ -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();