diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-04-21 14:09:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-04-21 15:32:08 +0200 |
| commit | 9d4343925824e7eda4403a9ffee718e31a5320a5 (patch) | |
| tree | 6a3f620c2a225231171feb965faf784c489c8faf | |
| parent | 86418b139f4fa70146243de67b5cc921dedf6c0f (diff) | |
| download | NetworkManager-9d4343925824e7eda4403a9ffee718e31a5320a5.tar.gz | |
fixup! dns: various cleanup for new dnsmasq's D-Bus support
| -rw-r--r-- | src/dns-manager/nm-dns-dnsmasq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index d5eda11d5e..988ba984b7 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -480,9 +480,10 @@ update (NMDnsPlugin *plugin, * we cleared up the dnsmasq cache; but we should also fail the update, so * that we don't write 127.0.0.1 to resolv.conf. */ - if (((vpn_configs && g_slist_length ((GSList *) vpn_configs) < 1) || !vpn_configs) && - ((dev_configs && g_slist_length ((GSList *) dev_configs) < 1) || !dev_configs) && - ((other_configs && g_slist_length ((GSList *) other_configs) < 1) || !other_configs)) + if ( !global_config + && ((vpn_configs && g_slist_length ((GSList *) vpn_configs) < 1) || !vpn_configs) + && ((dev_configs && g_slist_length ((GSList *) dev_configs) < 1) || !dev_configs) + && ((other_configs && g_slist_length ((GSList *) other_configs) < 1) || !other_configs)) return FALSE; return TRUE; |