fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-02 17:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: merge branch 'th/cli-secondaries-escape-delimiter'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=2177209

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1635
This commit is contained in:
Thomas Haller 2023-05-23 09:05:38 +02:00
commit 6069f75e00
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libnmc-setting/nm-meta-setting-desc.c
View file

@ -5606,7 +5606,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingConnection, nm_setting_connection_remove_secondary),
.remove_by_value_fcn = MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingConnection, nm_setting_connection_remove_secondary_by_value),
.validate2_fcn = _multilist_validate2_fcn_uuid,
.strsplit_plain = TRUE,
.strsplit_with_spaces = TRUE,
),
),
),

3
src/nmcli/settings.c
View file

@ -366,6 +366,9 @@ _set_fcn_precheck_connection_secondaries(NMClient *client,
if (!strv0)
return TRUE;
if (!client)
return TRUE;
connections = nm_client_get_connections(client);
strv = g_strdupv((char **) strv0);