From 1372848511cb896b80b51ed1a3e9606bd9816631 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 11:50:34 +0100 Subject: New upstream version 1.42.0 --- src/core/settings/nm-settings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/settings/nm-settings.c') diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c index b7d846c6..63476c3c 100644 --- a/src/core/settings/nm-settings.c +++ b/src/core/settings/nm-settings.c @@ -3479,7 +3479,7 @@ _save_hostname_write_cb(GObject *source, GAsyncResult *result, gpointer user_dat nm_utils_user_data_unpack(user_data, &self, &context, &auth_subject, &hostname, &cancellable); - nm_hostname_manager_write_hostname_finish(NM_HOSTNAME_MANAGER(source), result, &error); + nm_hostname_manager_set_static_hostname_finish(NM_HOSTNAME_MANAGER(source), result, &error); nm_audit_log_control_op(NM_AUDIT_OP_HOSTNAME_SAVE, hostname ?: "", @@ -3544,7 +3544,7 @@ _save_hostname_pk_cb(NMAuthChain *chain, GDBusMethodInvocation *context, gpointe (gpointer *) &priv->shutdown_cancellable); } - nm_hostname_manager_write_hostname( + nm_hostname_manager_set_static_hostname( priv->hostname_manager, hostname, priv->shutdown_cancellable, -- cgit 1.3.0-6-gf8a5 From dfaaf221cfee4ffcc507d793dae051d402646679 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Mar 2023 19:06:14 +0100 Subject: New upstream version 1.42.4 --- src/core/settings/nm-settings.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/core/settings/nm-settings.c') diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c index 63476c3c..9995b490 100644 --- a/src/core/settings/nm-settings.c +++ b/src/core/settings/nm-settings.c @@ -2009,6 +2009,7 @@ nm_settings_update_connection(NMSettings *self, const char *uuid; gboolean tombstone_in_memory = FALSE; gboolean tombstone_on_disk = FALSE; + NMSettingsConnectionIntFlags new_flags; g_return_val_if_fail(NM_IS_SETTINGS(self), FALSE); g_return_val_if_fail(NM_IS_SETTINGS_CONNECTION(sett_conn), FALSE); @@ -2228,13 +2229,16 @@ nm_settings_update_connection(NMSettings *self, } } + new_flags = nm_settings_connection_get_flags(sett_conn); + new_flags = NM_FLAGS_ASSIGN_MASK(new_flags, sett_mask, sett_flags); + if (!update_storage) { success = _add_connection_to_first_plugin(self, plugin_name, sett_conn_entry, connection, new_in_memory, - sett_flags, + new_flags, new_shadowed_storage_filename, new_shadowed_owned, &new_storage, @@ -2245,7 +2249,7 @@ nm_settings_update_connection(NMSettings *self, success = _update_connection_to_plugin(self, update_storage, connection, - sett_flags, + new_flags, update_reason, new_shadowed_storage_filename, new_shadowed_owned, -- cgit 1.3.0-6-gf8a5