diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-11-26 23:58:45 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-11-26 23:58:45 +0100 |
| commit | c283267467db7a7fde9d15042b907884118e8fea (patch) | |
| tree | 96cd17736b87a93f5d563f30c6008c6914a24981 /src/resolve/resolved.c | |
| parent | f7b5b034e8758079ddc7a915394704fc2a350c37 (diff) | |
| parent | 422baca0f230913158078fddf884e06c8c64a316 (diff) | |
Merge pull request #2031 from poettering/resolved-search-domains
resolved. Fully implement search domains for single-label names
Diffstat (limited to 'src/resolve/resolved.c')
| -rw-r--r-- | src/resolve/resolved.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c index 7ba0546f4a..be406b71fe 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -26,6 +26,7 @@ #include "mkdir.h" #include "resolved-conf.h" #include "resolved-manager.h" +#include "resolved-resolv-conf.h" #include "selinux-util.h" #include "signal-util.h" #include "user-util.h" @@ -81,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) { |