diff options
| author | Michael Biebl <biebl@debian.org> | 2018-03-13 01:30:38 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-03-13 01:30:38 +0100 |
| commit | bd71023d735a1dd11b1da3779850df573f134ad1 (patch) | |
| tree | e53ddb1bdc1f700b61377ec8a264cfce40515488 /src/dns | |
| parent | d0408a3e3b1cc6effec321d098008ef0c4acf91b (diff) | |
| parent | 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 (diff) | |
Update upstream source from tag 'upstream/1.10.6'
Update to upstream version '1.10.6' with Debian dir c37b318f40a9e6c07a543a8093e311df21e75045
Diffstat (limited to 'src/dns')
| -rw-r--r-- | src/dns/nm-dns-manager.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 973abc1c..dc545470 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -1448,11 +1448,13 @@ nm_dns_manager_stop (NMDnsManager *self) _LOGT ("stopping..."); /* If we're quitting, leave a valid resolv.conf in place, not one - * pointing to 127.0.0.1 if any plugins were active. Thus update - * DNS after disposing of all plugins. But if we haven't done any - * DNS updates yet, there's no reason to touch resolv.conf on shutdown. + * pointing to 127.0.0.1 if dnsmasq was active. But if we haven't + * done any DNS updates yet, there's no reason to touch resolv.conf + * on shutdown. */ - if (priv->dns_touched) { + if ( priv->dns_touched + && priv->plugin + && NM_IS_DNS_DNSMASQ (priv->plugin)) { if (!update_dns (self, TRUE, &error)) { _LOGW ("could not commit DNS changes on shutdown: %s", error->message); g_clear_error (&error); |