diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-12-29 00:23:29 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-17 14:47:31 +0100 |
| commit | e6637265f2133b9743bc349438627ae836aa3518 (patch) | |
| tree | bf69725cd2ec4d7260cb67ebff64460071d70c64 | |
| parent | 8273654c5daefff017f8a455de7b8427e9c22428 (diff) | |
| download | NetworkManager-e6637265f2133b9743bc349438627ae836aa3518.tar.gz | |
Revert "XXX connection: don't clear all the secrets when some change"
This reverts commit 7364958b6e77637e94e6348a29425ead8d09a265.
| -rw-r--r-- | libnm-core/nm-connection.c | 4 | ||||
| -rw-r--r-- | src/settings/nm-settings-connection.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 417bba3e01..98899ef7b7 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -1333,8 +1333,6 @@ nm_connection_update_secrets (NMConnection *connection, } g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection); - if (_nm_setting_clear_secrets (setting)) - updated = TRUE; success_detail = _nm_setting_update_secrets (setting, setting_dict ? setting_dict : secrets, error); @@ -1367,8 +1365,6 @@ nm_connection_update_secrets (NMConnection *connection, setting = nm_connection_get_setting_by_name (connection, key); g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection); - if (_nm_setting_clear_secrets (setting)) - updated = TRUE; success_detail = _nm_setting_update_secrets (setting, setting_dict, error); g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection); diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 75b5e3074d..51dd67e11b 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -1053,6 +1053,7 @@ get_secrets_done_cb (NMAgentManager *manager, dict = nm_connection_to_dbus (priv->system_secrets, NM_CONNECTION_SERIALIZE_ONLY_SECRETS); /* Update the connection with our existing secrets from backing storage */ + nm_connection_clear_secrets (NM_CONNECTION (self)); if (!dict || nm_connection_update_secrets (NM_CONNECTION (self), setting_name, dict, &local)) { GVariant *filtered_secrets; @@ -1113,6 +1114,8 @@ get_secrets_done_cb (NMAgentManager *manager, &agent_had_system, &cmp_flags); + nm_connection_clear_secrets (applied_connection); + if (!dict || nm_connection_update_secrets (applied_connection, setting_name, dict, NULL)) { GVariant *filtered_secrets; |