diff options
| author | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:42 +0200 |
| commit | a9c892f6640668b93848584d246280c4d33cc025 (patch) | |
| tree | 914226b8c8fffd1a8e101e71d361d6d126322c12 /src/libnm-client-impl/nm-device-ethernet.c | |
| parent | f03946fe0cdd73041658be1009f06f0e287c4b80 (diff) | |
| parent | 34bb501be08aa2b313d88e67d6e0a7e0a3f9cfa6 (diff) | |
Update upstream source from tag 'upstream/1.47.90'
Update to upstream version '1.47.90' with Debian dir fca683c43690f5e2bfc191d3d528666444bec54b
Diffstat (limited to 'src/libnm-client-impl/nm-device-ethernet.c')
| -rw-r--r-- | src/libnm-client-impl/nm-device-ethernet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libnm-client-impl/nm-device-ethernet.c b/src/libnm-client-impl/nm-device-ethernet.c index 42b7262d..f51e4992 100644 --- a/src/libnm-client-impl/nm-device-ethernet.c +++ b/src/libnm-client-impl/nm-device-ethernet.c @@ -195,7 +195,7 @@ connection_compatible(NMDevice *device, NMConnection *connection, GError **error if (s_wired) { const char *perm_addr, *s_mac; gboolean try_mac = TRUE; - const char *const *mac_blacklist; + const char *const *mac_denylist; int i; /* Check s390 subchannels */ @@ -232,20 +232,20 @@ connection_compatible(NMDevice *device, NMConnection *connection, GError **error return FALSE; } - /* Check for MAC address blacklist */ - mac_blacklist = nm_setting_wired_get_mac_address_blacklist(s_wired); - for (i = 0; mac_blacklist[i]; i++) { - if (!nm_utils_hwaddr_valid(mac_blacklist[i], ETH_ALEN)) { + /* Check for MAC address denylist */ + mac_denylist = nm_setting_wired_get_mac_address_denylist(s_wired); + for (i = 0; mac_denylist[i]; i++) { + if (!nm_utils_hwaddr_valid(mac_denylist[i], ETH_ALEN)) { g_warn_if_reached(); g_set_error(error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, _("Invalid MAC in the blacklist: %s."), - mac_blacklist[i]); + mac_denylist[i]); return FALSE; } - if (nm_utils_hwaddr_matches(mac_blacklist[i], -1, perm_addr, -1)) { + if (nm_utils_hwaddr_matches(mac_denylist[i], -1, perm_addr, -1)) { g_set_error(error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, |