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

keyfile: do not write offensive terms into keyfile

Browse Source 
As part of the conscious language efforts we are not writing offensive
terms into keyfiles anymore. This won't break users upgrading as we
still read such values if they are present into the keyfile.

For existing profiles, NetworkManager will remove the offensive terms
when editing the keyfile.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2009
This commit is contained in:
Fernando Fernandez Mancera
2024-08-02 13:30:20 +02:00
parent 8488162d10
commit 9f6ecbae69
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -22,6 +22,7 @@ USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
* Allow specifying a system OVS interface by MAC address * Allow specifying a system OVS interface by MAC address
* ndisc: Support multiple gateways for a single network * ndisc: Support multiple gateways for a single network
* wifi: Support configuring channel-width in AP mode * wifi: Support configuring channel-width in AP mode
* keyfile: Stop writing offensive terms into keyfiles
============================================= =============================================
NetworkManager-1.48 NetworkManager-1.48

10
src/libnm-core-impl/nm-keyfile.c
View File

@@ -4074,6 +4074,16 @@ write_setting_value(KeyfileWriterInfo *info,
return; return;
} }
/* Don't write offensive terms that are already deprecated as the new inclusive terms
* are being written.
*/
if (NM_IN_STRSET(key,
NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
NM_SETTING_CONNECTION_MASTER,
NM_SETTING_CONNECTION_SLAVE_TYPE,
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST))
return;
value = (GValue){0}; value = (GValue){0};
g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(property_info->param_spec)); g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(property_info->param_spec));