summaryrefslogtreecommitdiff
path: root/src/dns-manager/nm-dns-dnsmasq.c
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2016-01-25 21:36:30 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2016-01-25 21:46:11 +0100
commit96b11af92d6dcffc4ecc97503626d6dd525b8c92 (patch)
treeed18005e5745caf98aa4b2ab17bed65ddef776e9 /src/dns-manager/nm-dns-dnsmasq.c
parent3eb5037e1f34aa40320281893f58aca8ffa51952 (diff)
downloadNetworkManager-96b11af92d6dcffc4ecc97503626d6dd525b8c92.tar.gz
dns: fix generation of global configuration for dnsmasq
Fixes: ae9e82354a9c1b2247b7d071ed62acd9e83ae27b
Diffstat (limited to 'src/dns-manager/nm-dns-dnsmasq.c')
-rw-r--r--src/dns-manager/nm-dns-dnsmasq.c12
1 files 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]);
}
}