resolved: /etc/resolved.conf missing is not an error

[thirdparty/systemd.git] / src / resolve / resolved-manager.c

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index a4ca7c89d3b4a7019367c17cea88f060ac4cc2ff..7c6500e477a4734a62affc3abb3a2fcbb21c243f 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -597,9 +597,10 @@ int manager_read_resolv_conf(Manager *m) {
 
         r = stat("/etc/resolv.conf", &st);
         if (r < 0) {
-                if (errno != ENOENT)
-                        log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
-                r = -errno;
+                if (errno == ENOENT)
+                        r = 0;
+                else
+                        r = log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
                 goto clear;
         }
 
@@ -620,9 +621,10 @@ int manager_read_resolv_conf(Manager *m) {
 
         f = fopen("/etc/resolv.conf", "re");
         if (!f) {
-                if (errno != ENOENT)
-                        log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
-                r = -errno;
+                if (errno == ENOENT)
+                        r = 0;
+                else
+                        r = log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
                 goto clear;
         }