summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-11-20 17:46:35 +0100
committerThomas Haller <thaller@redhat.com>2019-11-20 17:48:03 +0100
commit2025e3585fe7676f835a973bfbef8d69c39994b0 (patch)
tree39edc353f7a0a1f4c1d4f08079e036ebd674aa60
parent52c0304bbd8c7d0315a95d8b3a210aa95c98c25a (diff)
downloadNetworkManager-2025e3585fe7676f835a973bfbef8d69c39994b0.tar.gz
device: allow reapply of all "user" settings
[user] are arbitrary strings that can be attached to a connection. NetworkManager itself does not care about them, they are only here for other applications. Allow reapplying changes to the user setting. Usually the reason to reject reapplying a setting is because it's either not implemented or not possible to change (without a full reactivation of the device). In this case there is nothing to implement, and of course it's possible to do so.
-rw-r--r--src/devices/nm-device.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 7c6e89fd53..62243d45af 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -50,6 +50,7 @@
#include "settings/nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "nm-setting-ethtool.h"
+#include "nm-setting-user.h"
#include "nm-auth-utils.h"
#include "nm-keep-alive.h"
#include "nm-netns.h"
@@ -11651,6 +11652,7 @@ can_reapply_change (NMDevice *self,
NM_SETTING_CONNECTION_MDNS,
NM_SETTING_CONNECTION_LLMNR);
} else if (NM_IN_STRSET (setting_name,
+ NM_SETTING_USER_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME)) {