fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-11 10:28:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: Add cert-authority and resolve-mode to global dns config hash

Browse source
This commit is contained in:
Tomas Korbar 2025-04-14 12:40:38 +02:00
parent 5580b982ac
commit bef448a93e
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/nm-config-data.c
View file

@ -401,7 +401,7 @@ nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self,
if (!nm_utils_ifname_valid_kernel(controller, NULL))
goto out_default;
match_data = (NMMatchSpecDeviceData) {
match_data = (NMMatchSpecDeviceData){
.interface_name = controller,
.device_type = port_type,
};
@ -1119,7 +1119,8 @@ nm_global_dns_config_update_checksum(const NMGlobalDnsConfig *dns_config, GCheck
v8 = NM_HASH_COMBINE_BOOLS(guint8,
!dns_config->searches,
!dns_config->options,
!dns_config->domain_list);
!dns_config->domain_list,
!dns_config->cert_authority);
g_checksum_update(sum, (guchar *) &v8, 1);
if (dns_config->searches) {
@ -1134,6 +1135,12 @@ nm_global_dns_config_update_checksum(const NMGlobalDnsConfig *dns_config, GCheck
(guchar *) dns_config->options[i],
strlen(dns_config->options[i]) + 1);
}
if (dns_config->cert_authority) {
g_checksum_update(sum,
(guchar *) dns_config->cert_authority,
strlen(dns_config->cert_authority) + 1);
}
g_checksum_update(sum, (guchar *) &dns_config->resolve_mode, sizeof(dns_config->resolve_mode));
if (dns_config->domain_list) {
for (i = 0; dns_config->domain_list[i]; i++) {
@ -2005,7 +2012,7 @@ _match_section_info_init(MatchSectionInfo *connection_info,
if (!value)
continue;
vals[j++] = (NMUtilsNamedValue) {
vals[j++] = (NMUtilsNamedValue){
.name = g_steal_pointer(&key),
.value_str = value,
};