From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 5 Jul 2017 03:51:35 +0000 (-0400)
Subject: resolved: treat failure to parse config as non-fatal
X-Git-Tag: v234~20^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ce497b59a99bb851d8e2907e9e3a633ccedba9b;p=platform%2Fupstream%2Fsystemd.git

resolved: treat failure to parse config as non-fatal

Fixes #6014.
---

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index cc9b26d..b662087 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -583,7 +583,7 @@ int manager_new(Manager **ret) {
 
         r = manager_parse_config_file(m);
         if (r < 0)
-                return r;
+                log_warning_errno(r, "Failed to parse configuration file: %m");
 
         r = sd_event_default(&m->event);
         if (r < 0)