diff options
| author | Michael Gebetsroither <michael@mgeb.org> | 2015-09-17 22:54:13 +0200 |
|---|---|---|
| committer | Michael Gebetsroither <michael@mgeb.org> | 2015-09-18 11:39:03 +0200 |
| commit | 9b5864d9d97bd1f1ba7a2010c8f0b679fb0d0d58 (patch) | |
| tree | 28bf831dea19bd99ebc19038d7c3526c0e321e85 /src/core | |
| parent | 10f4371fd7e0ec2670300cef137fdbfce55c7acb (diff) | |
load-fragment: resolve specifiers in RuntimeDirectory
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/load-fragment.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 1217b4651e..fcf863c5c7 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -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); |