shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

Merge pull request #1292 from gebi/resolve-specifier-in-runtime-directory

Browse Source 
load-fragment: resolve specifiers in RuntimeDirectory
This commit is contained in:
Lennart Poettering 2015-09-20 19:15:04 +02:00
commit 8c710f3ce6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/load-fragment.c
View File

@ -3049,6 +3049,7 @@ int config_parse_runtime_directory(
void *userdata) {
char***rt = data;
Unit *u = userdata;
const char *word, *state;
size_t l;
int r;
@ -3065,12 +3066,19 @@ int config_parse_runtime_directory(
}
FOREACH_WORD_QUOTED(word, l, rvalue, state) {
_cleanup_free_ char *n;
_cleanup_free_ char *t = NULL, *n = NULL;
n = strndup(word, l);
if (!n)
t = strndup(word, l);
if (!t)
return log_oom();
r = unit_name_printf(u, t, &n);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, -r,
"Failed to resolve specifiers, ignoring: %s", strerror(-r));
continue;
}
if (!filename_is_valid(n)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Runtime directory is not valid, ignoring assignment: %s", rvalue);