colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: fix an error in setting s390-options in nmcli editor

Browse Source 
nmcli> set eth.s390-options portno=
(process:4711): libnm-CRITICAL **: nm_setting_wired_add_s390_option: assertion 'value_len > 0 && value_len < 200' failed
This commit is contained in:
Jiří Klimeš
2015-11-27 21:58:05 +01:00
parent 5f9b8b887d
commit 6ffe4b61f7
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
clients/cli/settings.c
View File

@@ -4559,12 +4559,23 @@ nmc_property_wired_set_s390_nettype (NMSetting *setting, const char *prop, const
DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_s390_nettype, wired_valid_s390_nettypes) DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_s390_nettype, wired_valid_s390_nettypes)
/* 's390-options' */ /* 's390-options' */
/* Validate value of 's390-options' */
static const char *
_validate_s390_option_value (const char *option, const char *value, GError **error)
{
/* nm_setting_wired_add_s390_option() requires value len in <1,199> interval */
if (!value || !*value || strlen (value) >= 200) {
g_set_error (error, 1, 0, _("'%s' string value should consists of 1 - 199 characters"), option);
return NULL;
}
return value;
}
DEFINE_SETTER_OPTIONS (nmc_property_wired_set_s390_options, DEFINE_SETTER_OPTIONS (nmc_property_wired_set_s390_options,
NM_SETTING_WIRED, NM_SETTING_WIRED,
NMSettingWired, NMSettingWired,
nm_setting_wired_add_s390_option, nm_setting_wired_add_s390_option,
nm_setting_wired_get_valid_s390_options, nm_setting_wired_get_valid_s390_options,
NULL) _validate_s390_option_value)
DEFINE_REMOVER_OPTION (nmc_property_wired_remove_option_s390_options, DEFINE_REMOVER_OPTION (nmc_property_wired_remove_option_s390_options,
NM_SETTING_WIRED, NM_SETTING_WIRED,
nm_setting_wired_remove_s390_option) nm_setting_wired_remove_s390_option)