fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 01:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifupdown: drop a bogus warning

Browse source 
The key might be a wireless setting that has already been processed, not a
wireless-security setting.

(cherry picked from commit a5c204a69a)
This commit is contained in:
Lubomir Rintel 2016-03-14 13:48:47 +01:00
parent 1fe054d319
commit 0a112e12ce
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/settings/plugins/ifupdown/parser.c
View file

@ -319,11 +319,9 @@ update_wireless_security_setting_from_if_block(NMConnection *connection,
IfupdownStrDupeFunc dupe_func = map_by_mapping (dupe_mapping, curr->key+wireless_l);
IfupdownStrToTypeFunc type_map_func = map_by_mapping (type_mapping, curr->key+wireless_l);
GFreeFunc free_func = map_by_mapping (free_type_mapping, curr->key+wireless_l);
if(!newkey || !dupe_func) {
nm_log_warn (LOGD_SETTINGS, "no (wireless) mapping found for key: %s",
curr->key);
if(!newkey || !dupe_func)
goto next;
}
property_value = (*dupe_func) (curr->data, connection);
nm_log_info (LOGD_SETTINGS, "setting wireless security key: %s=%s",
newkey, property_value);
@ -354,9 +352,9 @@ update_wireless_security_setting_from_if_block(NMConnection *connection,
IfupdownStrDupeFunc dupe_func = map_by_mapping (dupe_mapping, curr->key+wpa_l);
IfupdownStrToTypeFunc type_map_func = map_by_mapping (type_mapping, curr->key+wpa_l);
GFreeFunc free_func = map_by_mapping (free_type_mapping, curr->key+wpa_l);
if(!newkey || !dupe_func) {
if(!newkey || !dupe_func)
goto next;
}
property_value = (*dupe_func) (curr->data, connection);
nm_log_info (LOGD_SETTINGS, "setting wpa security key: %s=%s",
newkey,