diff options
| author | Michael Biebl <biebl@debian.org> | 2023-03-09 19:07:28 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-03-09 19:07:28 +0100 |
| commit | 0829d7c18b0c99511de316ce551ed1930a400ca6 (patch) | |
| tree | 3822530717417783d3d6ba9fb08309ed55982a32 /src/core/settings | |
| parent | 22d6ee88e62404d127054bfee20c28da1ee324ce (diff) | |
| parent | dfaaf221cfee4ffcc507d793dae051d402646679 (diff) | |
Update upstream source from tag 'upstream/1.42.4'
Update to upstream version '1.42.4' with Debian dir 0dae05faaf02396619ae5080a3de6ac980b94990
Diffstat (limited to 'src/core/settings')
| -rw-r--r-- | src/core/settings/nm-settings.c | 8 |
1 files changed, 6 insertions, 2 deletions
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, |