diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-08-14 17:41:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-08-19 09:54:06 +0200 |
| commit | adfafd88b2c960e4e27ce1c292234d146d56b4ae (patch) | |
| tree | af785e15c850cd4ac463f5f4027e2133b68452b8 /src/shared/conf-parser.c | |
| parent | cgroup-util: update comment to reflect stable kernel fixes (diff) | |
| download | systemd-adfafd88b2c960e4e27ce1c292234d146d56b4ae.tar.xz systemd-adfafd88b2c960e4e27ce1c292234d146d56b4ae.zip | |
Revert "shared/conf-parser,networkd: EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE → EXTRACT_UNQUOTE"
This reverts commit 8a07b4033e5d3c86931b3dd2ddbca41118c05c60.
The tests are kept. test-networkd-conf is adjusted to pass.
This fixes #13276. I think current rules are extremely confusing, as the
case in test-networkd-conf shows. We apply some kinds of unescaping (relating
to quoting), but not others (related to escaping of special characters).
But fixing this is hard, because people have adjusted quoting to match
our rules, and if we make the rules "better", things might break in unexpected
places.
Diffstat (limited to '')
| -rw-r--r-- | src/shared/conf-parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index a495c2538b..40792086da 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -760,7 +760,7 @@ int config_parse_strv( for (;;) { char *word = NULL; - r = extract_first_word(&rvalue, &word, NULL, EXTRACT_UNQUOTE); + r = extract_first_word(&rvalue, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE); if (r == 0) break; if (r == -ENOMEM) |