From 032a3b47122fca3e23b2e6b5c0958814c8ca6765 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 20 Apr 2017 08:48:05 +0200 Subject: [PATCH] cli: only return main setting names as connection types Also, return the special slave types. --- clients/cli/connections.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 0951b7a26..535be2742 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -2855,6 +2855,9 @@ get_valid_options_string_toplevel (void) for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { const NMMetaSettingInfoEditor *setting_info = &nm_meta_setting_infos_editor[i]; + if (!setting_info->valid_parts) + continue; + if (str->len) g_string_append (str, ", "); if (setting_info->alias) @@ -2862,6 +2865,11 @@ get_valid_options_string_toplevel (void) else g_string_append (str, setting_info->general->setting_name); } + + if (str->len) + g_string_append (str, ", "); + g_string_append (str, "bond-slave, bridge-slave, team-slave"); + return g_string_free (str, FALSE); }