diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-05-23 15:02:20 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-05-26 09:47:43 +0200 |
| commit | 0c80e38f640c3d838806b537864c1702583cd9e4 (patch) | |
| tree | de016b7158c4b3ccf9318b64995cb4d48015db2c | |
| parent | 3c649e6429908e0b83bc176f8349c72ebd61ad60 (diff) | |
| download | NetworkManager-0c80e38f640c3d838806b537864c1702583cd9e4.tar.gz | |
dns/dnsmasq: use servers without split DNS if no domain was received
When a VPN server doesn't push any DNS domain, we want to use the
received servers for all queries.
https://bugzilla.gnome.org/show_bug.cgi?id=766769
| -rw-r--r-- | src/dns-manager/nm-dns-dnsmasq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 5cafb27cf4..5f096e2a47 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -143,12 +143,11 @@ add_ip4_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP4Config *ip4, for (iter = domains; iter && *iter; iter++) add_dnsmasq_nameserver (self, servers, buf, *iter); g_strfreev (domains); - added = TRUE; } } } - /* If no searches or domains, just add the namservers */ + /* If no searches or domains, just add the nameservers */ if (!added) { for (i = 0; i < nnameservers; i++) { addr = nm_ip4_config_get_nameserver (ip4, i); |