fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 01:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: fix evaluation of supported settings for *-slave connections

Browse source 
To determine the valid settings we must consider the actual connection
type, not the user-supplied one because, for example, "bridge-slave"
is in fact an ethernet connection.

Fixes: fb8fe1d8cb

https://bugzilla.redhat.com/show_bug.cgi?id=1440957
This commit is contained in:
Beniamino Galvani 2017-04-11 16:32:05 +02:00
parent 55ad538cfb
commit 45bef0ad17
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/cli/connections.c
View file

@ -6977,7 +6977,7 @@ menu_switch_to_level1 (NmCli *nmc,
}
static gboolean
editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_type)
editor_menu_main (NmCli *nmc, NMConnection *connection)
{
NMSettingConnection *s_con;
NMRemoteConnection *rem_con;
@ -7005,7 +7005,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
s_type = nm_setting_connection_get_slave_type (s_con);
slv_type = g_strdup_printf ("%s-slave", s_type ? s_type : "no");
valid_settings_main = get_valid_settings_array (connection_type);
valid_settings_main = get_valid_settings_array (nm_connection_get_connection_type (connection));
valid_settings_slave = get_valid_settings_array (slv_type);
g_free (slv_type);
@ -8047,11 +8047,11 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
/* Set global variables for use in TAB completion */
nmc_tab_completion.nmc = nmc;
nmc_tab_completion.con_type = g_strdup (connection_type);
nmc_tab_completion.con_type = g_strdup (nm_connection_get_connection_type (connection));
nmc_tab_completion.connection = connection;
/* Run menu loop */
editor_menu_main (nmc, connection, connection_type);
editor_menu_main (nmc, connection);
if (connection)
g_object_unref (connection);