From 96b11af92d6dcffc4ecc97503626d6dd525b8c92 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 25 Jan 2016 21:36:30 +0100 Subject: [PATCH] dns: fix generation of global configuration for dnsmasq Fixes: ae9e82354a9c1b2247b7d071ed62acd9e83ae27b --- src/dns-manager/nm-dns-dnsmasq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 63e37bf314..75076ff029 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -145,15 +145,15 @@ add_global_config (GString *str, const NMGlobalDnsConfig *config) for (i = 0; i < nm_global_dns_config_get_num_domains (config); i++) { NMGlobalDnsDomain *domain = nm_global_dns_config_get_domain (config, i); const char *const *servers = nm_global_dns_domain_get_servers (domain); + const char *name = nm_global_dns_domain_get_name (domain); + + g_return_if_fail (name); for (j = 0; servers && servers[j]; j++) { - if (!strcmp (servers[j], "*")) + if (!strcmp (name, "*")) g_string_append_printf (str, "server=%s\n", servers[j]); - else { - g_string_append_printf (str, "server=/%s/%s\n", - nm_global_dns_domain_get_name (domain), - servers[j]); - } + else + g_string_append_printf (str, "server=/%s/%s\n", name, servers[j]); } }