diff options
| author | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
| commit | b6357ff41de179d0aa2e35a6d574e5749fe09002 (patch) | |
| tree | ff038e98f4569fa3ba217266e6d288410ed84cd4 /src/core/nm-policy.c | |
| parent | 535ecf92edd8ad054ae8102a224c3dd8f3acf967 (diff) | |
| parent | 70e18d99b8e3e77bb37e218d7ac582130156f8ef (diff) | |
Update upstream source from tag 'upstream/1.45.90'
Update to upstream version '1.45.90' with Debian dir d723a85d75b9a8958dee17b97673a3fd9a80e18c
Diffstat (limited to 'src/core/nm-policy.c')
| -rw-r--r-- | src/core/nm-policy.c | 12 |
1 files changed, 8 insertions, 4 deletions
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 |