diff options
| author | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
| commit | 5ebc16389d33662f712e49a8d5f3445f6b34ca05 (patch) | |
| tree | af14aec1d1271903e73ef2b45d6b9c6d6c188f44 /src/libnm-core-impl/nm-setting-macsec.c | |
| parent | f07580d7a481ecbc1e90033b7fa5607e0ab2d051 (diff) | |
| parent | e96d74409128c6a977e31f24fad9b267d2feb9a1 (diff) | |
Update upstream source from tag 'upstream/1.48.8'
Update to upstream version '1.48.8' with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee
Diffstat (limited to 'src/libnm-core-impl/nm-setting-macsec.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-macsec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index 5732fa07..74d99c2e 100644 --- a/src/libnm-core-impl/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -316,24 +316,24 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (priv->parent) { if (nm_utils_is_uuid(priv->parent)) { - /* If we have an NMSettingConnection:master with slave-type="macsec", + /* If we have an NMSettingConnection:controller with port-type="macsec", * then it must be the same UUID. */ if (s_con) { - const char *master = NULL, *slave_type = NULL; + const char *controller = NULL, *port_type = NULL; - slave_type = nm_setting_connection_get_port_type(s_con); - if (!g_strcmp0(slave_type, NM_SETTING_MACSEC_SETTING_NAME)) - master = nm_setting_connection_get_controller(s_con); + port_type = nm_setting_connection_get_port_type(s_con); + if (!g_strcmp0(port_type, NM_SETTING_MACSEC_SETTING_NAME)) + controller = nm_setting_connection_get_controller(s_con); - if (master && g_strcmp0(priv->parent, master) != 0) { + if (controller && g_strcmp0(priv->parent, controller) != 0) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' value doesn't match '%s=%s'"), priv->parent, NM_SETTING_CONNECTION_CONTROLLER, - master); + controller); g_prefix_error(error, "%s.%s: ", NM_SETTING_MACSEC_SETTING_NAME, |