shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

core: print the right string when we fail to replace specifiers in config_parse_environ()

Browse Source
This commit is contained in:
Lennart Poettering 2017-09-12 19:47:58 +02:00
parent 82f93439af
commit f7f3f5c35c
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2108,16 +2108,17 @@ int config_parse_unit_env_file(const char *unit,
return 0;
}
int config_parse_environ(const char *unit,
const char *filename,
unsigned line,
const char *section,
unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
void *data,
void *userdata) {
int config_parse_environ(
const char *unit,
const char *filename,
unsigned line,
const char *section,
unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
void *data,
void *userdata) {
Unit *u = userdata;
char ***env = data;
@ -2153,7 +2154,7 @@ int config_parse_environ(const char *unit,
r = unit_full_printf(u, word, &k);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r,
"Failed to resolve specifiers, ignoring: %s", k);
"Failed to resolve specifiers, ignoring: %s", word);
continue;
}
} else {
@ -2170,6 +2171,7 @@ int config_parse_environ(const char *unit,
r = strv_env_replace(env, k);
if (r < 0)
return log_oom();
k = NULL;
}
}