mirror of
https://github.com/systemd/systemd
synced 2024-07-22 02:34:54 +00:00
load-fragment: use UNESCAPE_RELAX flag to parse exec directives
The cunescape() helper function used to handle unknown escaping sequences
gracefully by copying them over verbatim.
Commit 527b7a42
("util: rework cunescape(), improve error handling") added
a flag to make that behavior optional, and changed to default to error out
with -EINVAL otherwise.
However, config_parse_exec(), which is used to parse the
Exec{Start,Stop}{Post,Pre,} directives of unit files, was not changed along
with that commit, which means that directives with improperly escaped
command line strings are no longer parsed.
Relevant bugreports include:
https://bugs.freedesktop.org/show_bug.cgi?id=90794
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=787256
Fix this by passing UNESCAPE_RELAX to config_parse_exec() in order to
restore the original behavior.
This commit is contained in:
parent
ccc1002a1c
commit
22874a348f
Notes:
Lennart Poettering
2015-06-17 23:47:32 +02:00
Backport: bugfix
|
@ -610,7 +610,7 @@ int config_parse_exec(
|
|||
else
|
||||
skip = strneq(word, "\\;", MAX(l, 1U));
|
||||
|
||||
r = cunescape_length(word + skip, l - skip, 0, &c);
|
||||
r = cunescape_length(word + skip, l - skip, UNESCAPE_RELAX, &c);
|
||||
if (r < 0) {
|
||||
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to unescape command line, ignoring: %s", rvalue);
|
||||
r = 0;
|
||||
|
|
Loading…
Reference in a new issue