From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 26 Nov 2015 23:15:28 +0000 (+0100)
Subject: resolved: don't clear the server list too eagerly
X-Git-Tag: v229~264^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf7fabd6000fd95495904ed55db62caf361b3d8f;p=thirdparty%2Fsystemd.git

resolved: don't clear the server list too eagerly

If /etc/resolv.conf is missing, this should not result in the server
list to be cleared, after all the native data from resolved.conf
shouldn't be flushed out then. Hence flush out the data only if
/etc/resolv.conf exists, but we cannot read it for some reason.
---

diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 744969b7453..63bde1c2f41 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -50,9 +50,9 @@ int manager_read_resolv_conf(Manager *m) {
         r = stat("/etc/resolv.conf", &st);
         if (r < 0) {
                 if (errno == ENOENT)
-                        r = 0;
-                else
-                        r = log_warning_errno(errno, "Failed to stat /etc/resolv.conf: %m");
+                        return 0;
+
+                r = log_warning_errno(errno, "Failed to stat /etc/resolv.conf: %m");
                 goto clear;
         }
 
@@ -61,22 +61,18 @@ int manager_read_resolv_conf(Manager *m) {
         if (t == m->resolv_conf_mtime)
                 return 0;
 
-        m->resolv_conf_mtime = t;
-
         /* Is it symlinked to our own file? */
         if (stat("/run/systemd/resolve/resolv.conf", &own) >= 0 &&
             st.st_dev == own.st_dev &&
-            st.st_ino == own.st_ino) {
-                r = 0;
-                goto clear;
-        }
+            st.st_ino == own.st_ino)
+                return 0;
 
         f = fopen("/etc/resolv.conf", "re");
         if (!f) {
                 if (errno == ENOENT)
-                        r = 0;
-                else
-                        r = log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
+                        return 0;
+
+                r = log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
                 goto clear;
         }
 
@@ -115,6 +111,8 @@ int manager_read_resolv_conf(Manager *m) {
                 }
         }
 
+        m->resolv_conf_mtime = t;
+
         /* Flush out all servers and search domains that are still
          * marked. Those are then ones that didn't appear in the new
          * /etc/resolv.conf */