summaryrefslogtreecommitdiff
path: root/src/resolve/resolved.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-24 18:08:35 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-25 21:58:37 +0100
commit00fa60ae3b2823036cb3e7734f16bce30cb7441d (patch)
tree11c3cfce32ab2efa6e13ea8cfaa3426654cdbac7 /src/resolve/resolved.c
parent0eac462399c8e87bcce252cf058eba9f2678f2bd (diff)
resolved: make sure FallbackDNS= overrides built-in servers, doesn't extend them
Closes #342.
Diffstat (limited to 'src/resolve/resolved.c')
-rw-r--r--src/resolve/resolved.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index e07f49ce17..be406b71fe 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -82,8 +82,10 @@ int main(int argc, char *argv[]) {
}
r = manager_parse_config_file(m);
- if (r < 0)
- log_warning_errno(r, "Failed to parse configuration file: %m");
+ if (r < 0) {
+ log_error_errno(r, "Failed to parse configuration file: %m");
+ goto finish;
+ }
r = manager_start(m);
if (r < 0) {