fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 15:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: handle match.driver also with unknown device driver

Browse source 
If the driver is unknown, that doesn't necessarily mean that the match
passes. Instead, the match passes if there is no positive match that
asks for the driver name.
This commit is contained in:
Thomas Haller 2020-05-06 16:17:19 +02:00
parent 623cf7c9a3
commit bdd0e89b9a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/devices/nm-device.c
View file

@ -6042,6 +6042,7 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
NM_TYPE_SETTING_MATCH);
if (s_match) {
const char *const *patterns;
const char *device_driver;
guint num_patterns = 0;
/* interface_names */
@ -6104,17 +6105,12 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
}
}
{ /* driver */
const char *device_driver = nm_device_get_driver (self);
if (device_driver) {
patterns = nm_setting_match_get_drivers (s_match, &num_patterns);
if (!nm_wildcard_match_check (device_driver, patterns, num_patterns)) {
nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"device does not satisfy match.driver property");
return FALSE;
}
}
device_driver = nm_device_get_driver (self);
patterns = nm_setting_match_get_drivers (s_match, &num_patterns);
if (!nm_wildcard_match_check (device_driver, patterns, num_patterns)) {
nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"device does not satisfy match.driver property");
return FALSE;
}
}