colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: merge branch 'th/libnm-infiniband-fixes'

Browse Source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1223
This commit is contained in:
Thomas Haller
2022-05-12 15:53:34 +02:00
parent b6da925719 7012b9001a
commit 3a69aa50b8
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libnm-core-impl/nm-setting-infiniband.c
View File

@@ -241,6 +241,14 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
g_prefix_error(error, "%s: ", NM_SETTING_INFINIBAND_PARENT); g_prefix_error(error, "%s: ", NM_SETTING_INFINIBAND_PARENT);
return FALSE; return FALSE;
} }
if (NM_IN_SET(priv->p_key, 0, 0x8000)) {
g_set_error_literal(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("the values 0 and 0x8000 are not allowed"));
g_prefix_error(error, "%s: ", NM_SETTING_INFINIBAND_P_KEY);
return FALSE;
}
} }
if (connection) if (connection)
@@ -254,17 +262,27 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
virtual_iface_name = virtual_iface_name =
nm_setting_infiniband_get_virtual_interface_name(NM_SETTING_INFINIBAND(setting)); nm_setting_infiniband_get_virtual_interface_name(NM_SETTING_INFINIBAND(setting));
if (!nm_streq(interface_name, virtual_iface_name)) { if (!nm_streq0(interface_name, virtual_iface_name)) {
/* We don't support renaming software infiniband devices. Later we might, but /* We don't support renaming software infiniband devices. Later we might, but
* for now just reject such connections. * for now just reject such connections.
**/ **/
g_set_error(error, if (virtual_iface_name) {
NM_CONNECTION_ERROR, g_set_error(
NM_CONNECTION_ERROR_INVALID_PROPERTY, error,
_("interface name of software infiniband device must be '%s' or unset " NM_CONNECTION_ERROR,
"(instead it is '%s')"), NM_CONNECTION_ERROR_INVALID_PROPERTY,
virtual_iface_name, _("interface name of software infiniband device must be '%s' or unset "
interface_name); "(instead it is '%s')"),
virtual_iface_name,
interface_name);
} else {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("interface name of software infiniband device with MAC address "
"must be unset (instead it is '%s')"),
interface_name);
}
g_prefix_error(error, g_prefix_error(error,
"%s.%s: ", "%s.%s: ",
NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SETTING_NAME,