diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-17 00:27:12 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-17 00:47:20 +0200 |
| commit | 36f822c4bd077f9121757e24b6516e5c7ada63b5 (patch) | |
| tree | 9201ba3d895aa08a00c17ada422a3dd399e456f9 /src/resolve/resolved-manager.c | |
| parent | resolved: do not free() sd_dhcp_lease_get_dns() results (diff) | |
| download | systemd-36f822c4bd077f9121757e24b6516e5c7ada63b5.tar.xz systemd-36f822c4bd077f9121757e24b6516e5c7ada63b5.zip | |
Let config_parse open file where applicable
Special care is needed so that we get an error message if the
file failed to parse, but not when it is missing. To avoid duplicating
the same error check in every caller, add an additional 'warn' boolean
to tell config_parse whether a message should be issued.
This makes things both shorter and more robust wrt. to error reporting.
Diffstat (limited to 'src/resolve/resolved-manager.c')
| -rw-r--r-- | src/resolve/resolved-manager.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 3d2979dbbe..ab504d0a75 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -373,18 +373,12 @@ int config_parse_dnsv( } int manager_parse_config_file(Manager *m) { - int r; - assert(m); - r = config_parse(NULL, "/etc/systemd/resolved.conf", NULL, - "Resolve\0", - config_item_perf_lookup, resolved_gperf_lookup, - false, false, m); - if (r < 0) - log_warning("Failed to parse configuration file: %s", strerror(-r)); - - return 0; + return config_parse(NULL, "/etc/systemd/resolved.conf", NULL, + "Resolve\0", + config_item_perf_lookup, resolved_gperf_lookup, + false, false, true, m); } int manager_new(Manager **ret) { |