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

device: allow reapply with a different connection.uuid

Browse source
This commit is contained in:
Thomas Haller 2016-04-30 12:14:31 +02:00
parent ad38a1acb8
commit ec840b0331
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/devices/nm-device.c
View file

@ -7465,10 +7465,16 @@ reapply_connection (NMDevice *self,
NM_SETTING_CONNECTION_SETTING_NAME)) NM_SETTING_CONNECTION_SETTING_NAME))
return FALSE; return FALSE;
/* whitelist allowed properties from "connection" setting which are allowed to differ.
*
* This includes UUID, there is no principal problem with reapplying a connection
* and changing it's UUID. In fact, disallowing it makes it cumbersome for the user
* to reapply any connection but the original settings-connection. */
if (!_hash_check_invalid_keys (diffs ? g_hash_table_lookup (diffs, NM_SETTING_CONNECTION_SETTING_NAME) : NULL, if (!_hash_check_invalid_keys (diffs ? g_hash_table_lookup (diffs, NM_SETTING_CONNECTION_SETTING_NAME) : NULL,
NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SETTING_NAME,
error, error,
NM_SETTING_CONNECTION_ID, NM_SETTING_CONNECTION_ID,
NM_SETTING_CONNECTION_UUID,
NM_SETTING_CONNECTION_ZONE, NM_SETTING_CONNECTION_ZONE,
NM_SETTING_CONNECTION_METERED)) NM_SETTING_CONNECTION_METERED))
return FALSE; return FALSE;