diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-17 16:52:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-18 17:53:09 +0200 |
| commit | 758bf32640f4bc8e265ca572aba38a5c619bd6e5 (patch) | |
| tree | 1294f9f4d4cc06f806519db8840b0e022c4293e5 | |
| parent | 6bef72364df3dc56160eb309b280ebd40ac2cc26 (diff) | |
| download | NetworkManager-758bf32640f4bc8e265ca572aba38a5c619bd6e5.tar.gz | |
cli: fix splitting of multilist property in setter
The modes VALUE_STRSPLIT_MODE_OBJLIST* and VALUE_STRSPLIT_MODE_MULTILIST* are
different. We must use the right mode.
For example, _get_fcn_match_interface_name() concatenates the interface-names
with space. So, the tokenizer of the setter must also use space as delimiter.
VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE does that correctly,
VALUE_STRSPLIT_MODE_OBJLIST_WITH_ESCAPE does not.
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 964925f644..db4b93f623 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -1893,8 +1893,8 @@ _set_fcn_multilist (ARGS_SET_FCN) property_info->property_typ_data->subtype.multilist.strsplit_escaped_tokens ? VALUE_STRSPLIT_MODE_ESCAPED_TOKENS : ( property_info->property_typ_data->subtype.multilist.strsplit_with_escape - ? VALUE_STRSPLIT_MODE_OBJLIST_WITH_ESCAPE - : VALUE_STRSPLIT_MODE_OBJLIST), + ? VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE + : VALUE_STRSPLIT_MODE_MULTILIST), &nstrv); j = 0; |