From 15a859557549f99ab44d182ea2a5f8a8f732befc Mon Sep 17 00:00:00 2001 From: Antonio Cardace Date: Thu, 6 Feb 2020 17:06:32 +0100 Subject: [PATCH] nmcli: remove interface length check in nmcli nmcli should not perform checks on the interface name length, this kind of operations should only be performed by the NetworkManager daemon and not be duplicated inside cli applications. --- clients/cli/connections.c | 8 -------- clients/common/nm-meta-setting-desc.c | 22 +--------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 22e4307a9d..752e63c4ac 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -4255,18 +4255,10 @@ set_connection_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, co static gboolean set_connection_iface (NmCli *nmc, NMConnection *con, const OptionInfo *option, const char *value, GError **error) { - GError *tmp_error = NULL; - if (value) { /* Special value of '*' means no specific interface name */ if (strcmp (value, "*") == 0) value = NULL; - else if (!nm_utils_is_valid_iface_name (value, &tmp_error)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: '%s': %s"), value, tmp_error->message); - g_error_free (tmp_error); - return FALSE; - } } return set_property (nmc->client, diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 839e28628e..cd04e31d43 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -2089,8 +2089,6 @@ _set_fcn_gobject_ifname (ARGS_SET_FCN) if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) return _gobject_property_reset_default (setting, property_info->property_name); - if (!nm_utils_is_valid_iface_name (value, error)) - return FALSE; g_object_set (setting, property_info->property_name, value, NULL); return TRUE; } @@ -2567,24 +2565,6 @@ _multilist_remove_by_value_fcn_connection_permissions (NMSetting *setting, return TRUE; } -static gboolean -_set_fcn_connection_master (ARGS_SET_FCN) -{ - if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) - value = NULL; - else if (!*value) - value = NULL; - else if ( !nm_utils_is_valid_iface_name (value, NULL) - && !nm_utils_is_uuid (value)) { - g_set_error (error, 1, 0, - _("'%s' is not valid master; use ifname or connection UUID"), - value); - return FALSE; - } - g_object_set (setting, property_info->property_name, value, NULL); - return TRUE; -} - static const char *const* _complete_fcn_connection_master (ARGS_COMPLETE_FCN) { @@ -5129,7 +5109,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = { .prompt = NM_META_TEXT_PROMPT_MASTER, .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject, - .set_fcn = _set_fcn_connection_master, + .set_fcn = _set_fcn_gobject_string, .complete_fcn = _complete_fcn_connection_master, ), ),