fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 03:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: export search list in the D-Bus "domain" attribute

Browse source 
The "domain" key of the D-Bus configuration dictionary specifies the
domains a configuration applies to. In DNS code we consider domains
and searches as equivalent, so they should be exported via D-Bus using
the same logic used to populate resolv.conf and for plugins.
This commit is contained in:
Beniamino Galvani 2018-01-10 11:22:44 +01:00
parent b4db0e8362
commit 70550e2740
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/dns/nm-dns-manager.c
View file

@ -1902,6 +1902,7 @@ _get_config_variant (NMDnsManager *self)
GVariantBuilder builder;
NMDnsIPConfigData *ip_data;
const CList *head;
gs_unref_ptrarray GPtrArray *array_domains = NULL;
if (priv->config_variant)
return priv->config_variant;
@ -1944,18 +1945,28 @@ _get_config_variant (NMDnsManager *self)
"nameservers",
g_variant_builder_end (&strv_builder));
num = nm_ip_config_get_num_domains (ip_config);
num += nm_ip_config_get_num_searches (ip_config);
if (num > 0) {
g_variant_builder_init (&strv_builder, G_VARIANT_TYPE ("as"));
for (i = 0; i < num; i++) {
g_variant_builder_add (&strv_builder,
"s",
nm_ip_config_get_domain (ip_config, i));
if (!array_domains)
array_domains = g_ptr_array_sized_new (num);
else
g_ptr_array_set_size (array_domains, 0);
add_dns_domains (array_domains, ip_config, FALSE);
if (array_domains->len) {
g_variant_builder_init (&strv_builder, G_VARIANT_TYPE ("as"));
for (i = 0; i < array_domains->len; i++) {
g_variant_builder_add (&strv_builder,
"s",
array_domains->pdata[i]);
}
g_variant_builder_add (&entry_builder,
"{sv}",
"domains",
g_variant_builder_end (&strv_builder));
}
g_variant_builder_add (&entry_builder,
"{sv}",
"domains",
g_variant_builder_end (&strv_builder));
}
ifname = nm_platform_link_get_name (NM_PLATFORM_GET, ip_data->data->ifindex);