summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-18 11:28:55 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-18 11:39:25 +0200
commit2d4fffb00bbf528683946ee04e04980549124b0a (patch)
tree78fcd7775bf4b69ba9a39cbe58ade2d4456c1f8a
parentd611cfa748aaf600832160132774074e808c82c7 (diff)
downloadsystemd-2d4fffb00bbf528683946ee04e04980549124b0a.tar.gz
shared/conf-parser: be nice and ignore lines without "="
We generally don't treat syntax error as fatal, but in this case we would completely refuse to load the file. I think we should treat the the same as assignment outside of a section, or an unknown key name.
-rw-r--r--src/shared/conf-parser.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 62fc1c97b7..c3af230870 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -239,7 +239,6 @@ static int parse_line(
}
if (sections && !*section) {
-
if (!(flags & CONFIG_PARSE_RELAXED) && !*section_ignored)
log_syntax(unit, LOG_WARNING, filename, line, 0, "Assignment outside of section. Ignoring.");
@@ -247,10 +246,9 @@ static int parse_line(
}
e = strchr(l, '=');
- if (!e) {
- log_syntax(unit, LOG_WARNING, filename, line, 0, "Missing '='.");
- return -EINVAL;
- }
+ if (!e)
+ return log_syntax(unit, LOG_WARNING, filename, line, 0,
+ "Missing '=', ignoring line.");
*e = 0;
e++;