diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-21 13:07:30 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-23 12:20:42 +0200 |
| commit | a8f3f0f686ba72dbcd185746b4ade2663572aeff (patch) | |
| tree | 5490243bf9a0d22f04f27ccd387c3b21a64c0744 | |
| parent | 9ed7ef9018b9d0c5ac127ab6c8cf092e4e3bfe4c (diff) | |
| download | NetworkManager-a8f3f0f686ba72dbcd185746b4ade2663572aeff.tar.gz | |
cli: use escaped-tokens style for team-link-watcher list properties
The link-watcher properties are not expected to contain any special values
that require escaping. Hence, change the tokenizing from plain splitting
at ',' to escaped-tokens style is likely to not affect any existing
setups.
Still, all our properties should be handled the same way (including a
tokenizing which allows escaping to represent every possible value).
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 68226eca12..e5759e5358 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -3631,7 +3631,7 @@ _objlist_obj_to_str_fcn_team_link_watchers (NMMetaAccessorGetType get_type, s = nm_utils_team_link_watcher_to_string (watcher); if (s) - g_string_append (str, s); + nm_utils_escaped_tokens_escape_gstr (s, ESCAPED_TOKENS_DELIMITERS, str); } static gboolean @@ -6512,7 +6512,6 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { .obj_to_str_fcn = _objlist_obj_to_str_fcn_team_link_watchers, .set_fcn = _objlist_set_fcn_team_link_watchers, .remove_by_idx_fcn_u = OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTeam, nm_setting_team_remove_link_watcher), - .strsplit_plain = TRUE, ), ), ), @@ -6589,7 +6588,6 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = { .obj_to_str_fcn = _objlist_obj_to_str_fcn_team_link_watchers, .set_fcn = _objlist_set_fcn_team_link_watchers, .remove_by_idx_fcn_u = OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTeamPort, nm_setting_team_port_remove_link_watcher), - .strsplit_plain = TRUE, ), ), ), |