summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-08-01 01:18:14 +0200
committerLennart Poettering <lennart@poettering.net>2011-08-01 01:18:14 +0200
commitd937fbbd97760d4d1a59dc0fa6f3000e57a96998 (patch)
tree6d1dafd74b560cec6a3126d8e7e0048d8a934145
parentf975e971accc4d50c73ae53167db3df7a7099cf2 (diff)
conf-parser: properly handle known but not parsed assignments
-rw-r--r--src/conf-parser.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/conf-parser.c b/src/conf-parser.c
index 970877650d..a99c70596b 100644
--- a/src/conf-parser.c
+++ b/src/conf-parser.c
@@ -131,8 +131,12 @@ static int next_assignment(
if (r < 0)
return r;
- if (func)
- return func(filename, line, section, lvalue, ltype, rvalue, data, userdata);
+ if (r > 0) {
+ if (func)
+ return func(filename, line, section, lvalue, ltype, rvalue, data, userdata);
+
+ return 0;
+ }
/* Warn about unknown non-extension fields. */
if (!relaxed && !startswith(lvalue, "X-"))