X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-manager.c;h=2edfb9f7fdee20b50f071e94d9bc19d85e7f53cb;hp=0594479787606127426a59e9b2a477f4352735e7;hb=36a03ca2a8952ca1acb29fbe796210c27ff71aff;hpb=c9403dced7c3eb0cc2a925c6428ca30ef8527b55

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 059447978..2edfb9f7f 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -667,6 +667,16 @@ int manager_read_resolv_conf(Manager *m) {
                 if (s->marked)
                         dns_server_free(s);
 
+        /* Whenever /etc/resolv.conf changes, start using the first
+         * DNS server of it. This is useful to deal with broken
+         * network managing implementations (like NetworkManager),
+         * that when connecting to a VPN place both the VPN DNS
+         * servers and the local ones in /etc/resolv.conf. Without
+         * resetting the DNS server to use back to the first entry we
+         * will continue to use the local one thus being unable to
+         * resolve VPN domains. */
+        manager_set_dns_server(m, m->dns_servers);
+
         return 0;
 
 clear: