fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 04:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings-connection: fix Save()

Browse source 
Avoid using new_settings when they are none. Also, don't shortcut when
the connection hasn't been changed -- let the settings plugin decide if
it needs to rewrite the connection.

(cherry picked from commit b47340fd3f)
(cherry picked from commit 58c9a41959)
This commit is contained in:
Lubomir Rintel 2017-02-21 09:57:54 +01:00 • committed by Beniamino Galvani
parent dec4423a9d
commit 1eebc0ca01
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/settings/nm-settings-connection.c
View file

@ -1697,6 +1697,17 @@ update_auth_cb (NMSettingsConnection *self,
return;
}
if (!info->new_settings) {
/* We're just calling Save(). Just commit the existing connection. */
if (info->save_to_disk) {
nm_settings_connection_commit_changes (self,
NM_SETTINGS_CONNECTION_COMMIT_REASON_USER_ACTION,
con_update_cb,
info);
}
return;
}
if (!any_secrets_present (info->new_settings)) {
/* If the new connection has no secrets, we do not want to remove all
* secrets, rather we keep all the existing ones. Do that by merging
@ -1846,11 +1857,7 @@ static void
impl_settings_connection_save (NMSettingsConnection *self,
GDBusMethodInvocation *context)
{
/* Do nothing if the connection is already synced with disk */
if (nm_settings_connection_get_unsaved (self))
settings_connection_update_helper (self, context, NULL, TRUE);
else
g_dbus_method_invocation_return_value (context, NULL);
settings_connection_update_helper (self, context, NULL, TRUE);
}
static void