Update upstream source from tag 'upstream/1.48.8'

Update to upstream version '1.48.8'
with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee

1 files changed, 11 insertions, 1 deletions

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));