summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-08-14 17:41:31 +0200
committerLennart Poettering <lennart@poettering.net>2019-08-19 09:54:06 +0200
commitadfafd88b2c960e4e27ce1c292234d146d56b4ae (patch)
treeaf785e15c850cd4ac463f5f4027e2133b68452b8 /src/network
parentcda5ccdb342f056aa40dea939598d8a799c9c18d (diff)
downloadsystemd-adfafd88b2c960e4e27ce1c292234d146d56b4ae.tar.gz
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 'src/network')
-rw-r--r--src/network/test-networkd-conf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
index 6883cbe1ec..2007acb781 100644
--- a/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@ -240,7 +240,7 @@ static void test_config_parse_match_strv(void) {
"!baz",
"KEY=val",
"KEY2=val with space",
- "KEY3=val with \"quotation\"")));
+ "KEY3=val with \\quotation\\")));
}
int main(int argc, char **argv) {