RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: keyring uses a search path again

Browse Source
This commit is contained in:
Yehuda Sadeh 2011-01-13 16:08:22 -08:00
parent 58a0f384bd
commit 2b2d52cfaf
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/config.cc
View File

@ -372,7 +372,7 @@ static struct config_option config_optionsp[] = {
OPTION(debug_finisher, 0, OPT_INT, 1),
OPTION(key, 0, OPT_STR, ""),
OPTION(keyfile, 'K', OPT_STR, ""),
OPTION(keyring, 'k', OPT_STR, "/etc/ceph/keyring.bin"),
OPTION(keyring, 'k', OPT_STR, "/etc/ceph/keyring,/etc/ceph/keyring.bin"),
OPTION(clock_lock, 0, OPT_BOOL, false),
OPTION(clock_tare, 0, OPT_BOOL, false),
OPTION(ms_tcp_nodelay, 0, OPT_BOOL, true),
@ -1328,6 +1328,7 @@ void parse_config_options(std::vector<const char*>& args)
nargs.push_back(args[i]);
}
env_override(&g_conf.keyring, "CEPH_KEYRING");
install_sighandler(SIGHUP, sighup_handler, SA_RESTART);
@ -1342,3 +1343,22 @@ void parse_config_options(std::vector<const char*>& args)
args = nargs;
}
bool ceph_resolve_file_search(string& filename_list, string& result)
{
list<string> ls;
get_str_list(filename_list, ls);
list<string>::iterator iter;
for (iter = ls.begin(); iter != ls.end(); ++iter) {
int fd = ::open(iter->c_str(), O_RDONLY);
if (fd < 0)
continue;
close(fd);
result = *iter;
return true;
}
return false;
}

2
src/config.h
View File

@ -531,6 +531,8 @@ bool conf_set_conf_val(void *field, opt_type_t type, const char *val);
bool conf_cmd_equals(const char *cmd, const char *opt, char char_opt, unsigned int *val_pos);
int ceph_def_conf_by_name(const char *name, char *buf, int len);
bool ceph_resolve_file_search(string& filename_list, string& result);
class ExportControl;
ExportControl *conf_get_export_control();