From 0a112e12ceac65f923de0d78e645cc882ea40d9d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 14 Mar 2016 13:48:47 +0100 Subject: [PATCH] ifupdown: drop a bogus warning The key might be a wireless setting that has already been processed, not a wireless-security setting. (cherry picked from commit a5c204a69ac5483a5251a02d5fae8aecd4ca38df) --- src/settings/plugins/ifupdown/parser.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 15081a4c59..5880c73fd1 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -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,