colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns: Make dnsconfd plugin respect dns-priority

Browse Source 
Fixes #1748
This commit is contained in:
Tomas Korbar
2025-04-11 11:09:10 +02:00
committed by Beniamino Galvani
parent 7b2924b762
commit e41558e08c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/dns/nm-dns-dnsconfd.c
View File

@@ -368,7 +368,8 @@ server_builder_append_base(GVariantBuilder *argument_builder,
const char *address_string, const char *address_string,
const char *const *routing_domains, const char *const *routing_domains,
const char *const *search_domains, const char *const *search_domains,
const char *ca) const char *ca,
int priority)
{ {
NMDnsServer dns_server; NMDnsServer dns_server;
gsize addr_size; gsize addr_size;
@@ -407,6 +408,9 @@ server_builder_append_base(GVariantBuilder *argument_builder,
if (ca) { if (ca) {
g_variant_builder_add(argument_builder, "{sv}", "ca", g_variant_new("s", ca)); g_variant_builder_add(argument_builder, "{sv}", "ca", g_variant_new("s", ca));
} }
/* dnsconfd defines priority as bigger number equals bigger priority, while NM
* uses the exact opposite, thus use -priority */
g_variant_builder_add(argument_builder, "{sv}", "priority", g_variant_new("i", -priority));
return TRUE; return TRUE;
} }
@@ -443,7 +447,8 @@ parse_global_config(const NMGlobalDnsConfig *global_config,
servers[j], servers[j],
routing_domains, routing_domains,
searches, searches,
*ca)) { *ca,
NM_DNS_PRIORITY_DEFAULT_NORMAL)) {
g_variant_builder_close(argument_builder); g_variant_builder_close(argument_builder);
} }
} }
@@ -628,6 +633,7 @@ parse_all_interface_config(GVariantBuilder *argument_builder,
NMDnsConfigIPData *ip_data; NMDnsConfigIPData *ip_data;
const char *const *dns_server_strings; const char *const *dns_server_strings;
guint nameserver_count; guint nameserver_count;
int priority;
const char *ifname; const char *ifname;
gboolean explicit_default = is_default_interface_explicit(ip_data_lst_head); gboolean explicit_default = is_default_interface_explicit(ip_data_lst_head);
@@ -648,6 +654,9 @@ parse_all_interface_config(GVariantBuilder *argument_builder,
gather_interface_domains(ip_data, explicit_default, &routing_domains, &search_domains); gather_interface_domains(ip_data, explicit_default, &routing_domains, &search_domains);
get_networks(ip_data, &networks); get_networks(ip_data, &networks);
if (!nm_l3_config_data_get_dns_priority(ip_data->l3cd, ip_data->addr_family, &priority)) {
priority = NM_DNS_PRIORITY_DEFAULT_NORMAL;
}
for (guint i = 0; i < nameserver_count; i++) { for (guint i = 0; i < nameserver_count; i++) {
if (server_builder_append_base(argument_builder, if (server_builder_append_base(argument_builder,
@@ -655,7 +664,8 @@ parse_all_interface_config(GVariantBuilder *argument_builder,
dns_server_strings[i], dns_server_strings[i],
routing_domains, routing_domains,
search_domains, search_domains,
ca)) { ca,
priority)) {
server_builder_append_interface_info(argument_builder, ifname, networks); server_builder_append_interface_info(argument_builder, ifname, networks);
} }
} }