diff options
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, |