diff options
| author | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2024-01-16 15:13:42 +0100 |
|---|---|---|
| committer | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2024-01-17 18:41:42 +0100 |
| commit | b9f7b1a17b9df0508c3920fe9d96f21a272f6e3f (patch) | |
| tree | 09ab3508b077e05c070c82e619c1ed971a61cd18 | |
| parent | 876e8a4da13f9f6ea9ab1b61b124a7288e1ca203 (diff) | |
utils: drop both "master" and "controller" from the dictionaryff/fix_master_controller
If a generated connection matches a connection that uses interface name
as controller, we need to drop the existing value from the settings to
avoid conflicts. Therefore, both of them need to be dropped; controller
and master.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1833
Fixes: 3e4a2ebb3c63 ('all: use the new NMSettingConnection Controller property')
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
| -rw-r--r-- | src/core/NetworkManagerUtils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index e4ad18ac52..15ce8eb857 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -722,6 +722,10 @@ check_connection_controller(NMConnection *orig, NMConnection *candidate, GHashTa remove_from_hash(settings, props, NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_MASTER); + remove_from_hash(settings, + props, + NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_CONTROLLER); return TRUE; } else { |