From e96d74409128c6a977e31f24fad9b267d2feb9a1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 9 Aug 2024 18:57:15 +0200 Subject: New upstream version 1.48.8 --- src/libnm-core-impl/nm-keyfile.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/libnm-core-impl/nm-keyfile.c') diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index 078ea5d7..8dadf3cd 100644 --- a/src/libnm-core-impl/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -233,7 +233,7 @@ _secret_flags_persist_secret(NMSettingSecretFlags flags) /*****************************************************************************/ /* Some setting properties also contain setting names, such as * NMSettingConnection's 'type' property (which specifies the base type of the - * connection, e.g. ethernet or wifi) or 'slave-type' (specifies type of slave + * connection, e.g. ethernet or wifi) or 'port-type' (specifies type of port * connection, e.g. bond or bridge). This function handles translating those * properties' values to the real setting name if they are an alias. */ @@ -4074,6 +4074,16 @@ write_setting_value(KeyfileWriterInfo *info, 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}; g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(property_info->param_spec)); -- cgit 1.3.0-6-gf8a5