RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

keyring: make --key, --keyfile override loaded keyring

Browse Source 
This way --key, --keyfile still work when a keyring is in the default
search path.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-08-15 19:06:04 -07:00
parent 7b57931ba5
commit e0b094b9ff
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/auth/KeyRing.cc
View File

@ -38,15 +38,14 @@ int KeyRing::from_ceph_context(CephContext *cct)
{
const md_config_t *conf = cct->_conf;
int ret = 0;
int ret = -ENOENT;
string filename;
if (ceph_resolve_file_search(conf->keyring, filename)) {
ret = load(cct, filename);
if (ret == 0)
return 0;
lderr(cct) << "failed to load " << filename
<< ": " << cpp_strerror(ret) << dendl;
if (ret < 0)
lderr(cct) << "failed to load " << filename
<< ": " << cpp_strerror(ret) << dendl;
}
if (!conf->key.empty()) {
@ -83,7 +82,7 @@ int KeyRing::from_ceph_context(CephContext *cct)
return 0;
}
return -ENOENT;
return ret;
}
KeyRing *KeyRing::create_empty()