From d09e33f38cc09d1f70a808544bbf6b6f428d3195 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 2 Nov 2018 11:28:26 +0100 Subject: [PATCH] cli: editor: reload secrets after updating connection Connection secrets are lost after calling nm_connection_replace_settings_from_connection() because @con_tmp doesn't contain secrets; refetch them like we do when starting the editor. (cherry picked from commit 096eef61d499d0d9e7ef198610b75814b2c86a35) --- clients/cli/connections.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index bcd257ac2e..3876749a04 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -7713,9 +7713,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t if (menu_ctx.curr_setting) s_name = g_strdup (nm_setting_get_name (menu_ctx.curr_setting)); - /* Update settings in the local connection */ + /* Update settings and secrets in the local connection */ nm_connection_replace_settings_from_connection (connection, NM_CONNECTION (con_tmp)); + update_secrets_in_connection (con_tmp, connection); /* Also update setting for menu context and TAB-completion */ menu_ctx.curr_setting = s_name ? nm_connection_get_setting_by_name (connection, s_name) : NULL;