diff options
author | Thomas Haller <thaller@redhat.com> | 2021-06-24 22:28:42 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-07-01 11:04:22 +0200 |
commit | 15a02717813679df90ab9fade24b0036e40d47e1 (patch) | |
tree | c47710c2236882120fc5e66114a1522f8230206f | |
parent | 4a4f214722e29ae437f428dcb803e4b63f74f617 (diff) | |
download | NetworkManager-15a02717813679df90ab9fade24b0036e40d47e1.tar.gz |
settings: don't populate seen-bssids list from connection profile
ifcfg-rh plugin never stored the seen bssid list to file, and
keyfile no longer does, and it's no longer parsed from GVariant.
So there is actually no way how anything could be set here.
The seen-bssids should only be populate from
"/var/lib/NetworkManager/seen-bssids". Nowhere else.
-rw-r--r-- | src/core/settings/nm-settings-connection.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c index 641f3297b8..de5b7c296e 100644 --- a/src/core/settings/nm-settings-connection.c +++ b/src/core/settings/nm-settings-connection.c @@ -2321,30 +2321,6 @@ _nm_settings_connection_register_kf_dbs(NMSettingsConnection *self, for (i = len; i > 0;) g_hash_table_add(priv->seen_bssids, g_steal_pointer(&tmp_strv[--i])); nm_clear_g_free(&tmp_strv); - } else { - NMSettingWireless *s_wifi; - - _LOGT("no seen-bssids from keyfile database \"%s\"", - nm_key_file_db_get_filename(priv->kf_db_seen_bssids)); - - /* If this connection didn't have an entry in the seen-bssids database, - * maybe this is the first time we've read it in, so populate the - * seen-bssids list from the deprecated seen-bssids property of the - * wifi setting. - */ - s_wifi = - nm_connection_get_setting_wireless(nm_settings_connection_get_connection(self)); - if (s_wifi) { - len = nm_setting_wireless_get_num_seen_bssids(s_wifi); - if (len > 0) { - priv->seen_bssids = _seen_bssids_hash_new(); - for (i = 0; i < len; i++) { - const char *bssid = nm_setting_wireless_get_seen_bssid(s_wifi, i); - - g_hash_table_add(priv->seen_bssids, g_strdup(bssid)); - } - } - } } } } |