fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-09 23:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'fix_reader_accept_all' into 'main'

Browse source 
ifcfg: fix wired reader for ACCEPT_ALL_MAC_ADDRESSES key

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/858
This commit is contained in:
Beniamino Galvani 2021-05-19 08:42:11 +00:00
commit 1b7300ace9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -5022,6 +5022,7 @@ make_wired_setting(shvarFile *ifcfg, const char *file, NMSetting8021x **s_8021x,
const char * cvalue;
gs_free char * value = NULL;
gboolean found = FALSE;
NMTernary accept_all_mac_addresses;
s_wired = NM_SETTING_WIRED(nm_setting_wired_new());
@ -5180,10 +5181,14 @@ make_wired_setting(shvarFile *ifcfg, const char *file, NMSetting8021x **s_8021x,
}
nm_clear_g_free(&value);
g_object_set(s_wired,
NM_SETTING_WIRED_ACCEPT_ALL_MAC_ADDRESSES,
svGetValueTernary(ifcfg, "ACCEPT_ALL_MAC_ADDRESSES"),
NULL);
accept_all_mac_addresses = svGetValueTernary(ifcfg, "ACCEPT_ALL_MAC_ADDRESSES");
if (accept_all_mac_addresses != NM_TERNARY_DEFAULT) {
g_object_set(s_wired,
NM_SETTING_WIRED_ACCEPT_ALL_MAC_ADDRESSES,
accept_all_mac_addresses,
NULL);
found = TRUE;
}
if (!found) {
g_set_error(error,