From e9d8c4e44e97c28fbe1af04ae39bd8280bf2f40b Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 23 May 2016 15:02:20 +0200 Subject: [PATCH] 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 (cherry picked from commit dd3dfad5835eea7617d883d4c665c0be66fa09f7) (cherry picked from commit 0c80e38f640c3d838806b537864c1702583cd9e4) --- src/dns-manager/nm-dns-dnsmasq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index f26ccfaa3f..ba81456fcd 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -100,12 +100,11 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split) for (iter = domains; iter && *iter; iter++) g_string_append_printf (str, "server=/%s/%s\n", *iter, buf); 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);