diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-06-01 17:49:04 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-06-01 18:08:44 +0200 |
| commit | 22874a348fb1540c1a2b7907748fc57c9756a7ed (patch) | |
| tree | e3960fb8d08ccb4d045207a90a00434481b91525 | |
| parent | ccc1002a1c510b7d4631833eaf60225f028f2280 (diff) | |
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.
| -rw-r--r-- | src/core/load-fragment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index c95c11014c..df5fe6fb32 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -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; |