From 70e18d99b8e3e77bb37e218d7ac582130156f8ef Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 25 Jan 2024 09:46:18 +0100 Subject: New upstream version 1.45.90 --- src/core/nm-policy.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/core/nm-policy.c') diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index efdb0636..feea97b1 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -1766,7 +1766,7 @@ _connection_autoconnect_retries_set(NMPolicy *self, nm_assert(retry_time != 0); priv->reset_connections_retries_idle_source = nm_g_timeout_add_seconds_source( - MAX(0, retry_time - nm_utils_get_monotonic_timestamp_sec()), + NM_MAX(0, retry_time - nm_utils_get_monotonic_timestamp_sec()), reset_connections_retries, self); } @@ -2635,11 +2635,15 @@ dns_config_changed(NMDnsManager *dns_manager, gpointer user_data) if (priv->updating_dns) return; - nm_manager_for_each_device (priv->manager, device, tmp_lst) { - nm_device_clear_dns_lookup_data(device, "DNS configuration changed"); + if (!nm_dns_manager_is_unmanaged(dns_manager)) { + nm_manager_for_each_device (priv->manager, device, tmp_lst) { + nm_device_clear_dns_lookup_data(device, "DNS configuration changed"); + } + + update_system_hostname(self, "DNS configuration changed"); } - update_system_hostname(self, "DNS configuration changed"); + nm_dispatcher_call_dns_change(); } static void -- cgit 1.3.0-6-gf8a5