From 46d53e11012c047e09d04f663c1c36e6c47dc298 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Jan 2017 11:54:47 +0100 Subject: [PATCH] keyfile: fix interpreting missing wifi.mac-address-randomization as permanent address With commit 4f6c91d6962cc031f07e52bb31adde560ad70fac, we aimed to enable mac-address-randomization by default for Wi-Fi. That however is not possible by default because it breaks various scenarios. Also, later wifi.mac-address-randomization was deprecated in favor of wifi.cloned-mac-address setting. Both wifi.mac-address-randomization and wifi.cloned-mac-address support global default values, so it is wrong to read a missing mac-address-randomization as "NEVER" -- which due to normalization also results in cloned-mac-address=permanent. --- libnm-core/nm-keyfile-reader.c | 5 ----- libnm-core/nm-keyfile-writer.c | 3 --- 2 files changed, 8 deletions(-) diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c index 3fa4de7c01..c071264d32 100644 --- a/libnm-core/nm-keyfile-reader.c +++ b/libnm-core/nm-keyfile-reader.c @@ -1376,11 +1376,6 @@ static void set_default_for_missing_key (NMSetting *setting, const char *property) { /* Set a value different from the default value of the property's spec */ - - if (NM_IS_SETTING_WIRELESS (setting)) { - if (!strcmp (property, NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION)) - g_object_set (setting, property, (NMSettingMacRandomization) NM_SETTING_MAC_RANDOMIZATION_NEVER, NULL); - } } static void diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c index dfcdb3d4ed..3a7007d954 100644 --- a/libnm-core/nm-keyfile-writer.c +++ b/libnm-core/nm-keyfile-writer.c @@ -638,9 +638,6 @@ can_omit_default_value (NMSetting *setting, const char *property) } else if (NM_IS_SETTING_IP6_CONFIG (setting)) { if (!strcmp (property, NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE)) return FALSE; - } else if (NM_IS_SETTING_WIRELESS (setting)) { - if (!strcmp (property, NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION)) - return FALSE; } return TRUE;