[PATCH 3/3] fix some wireless- key mappings

[Alexander Sack <asac ubuntu com>]

From: Alexander Sack <asac jwsdot com>

* system-settings/plugins/ifupdown/parser.c
 	- (update_wireless_security_setting_from_if_block): fix
 		mapping for ifupdown wireless- keys not supported
 		wireless security settings: password, identity and
 		key


Signed-off-by: Alexander Sack <asac ubuntu com>
---
 ChangeLog                                 |    5 +++++
 system-settings/plugins/ifupdown/parser.c |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5542b1..de7082f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@
 			ifupdown crash caused by previously not	support key
 			format for 'key', 'wep-key0', 'wep-key1', 'wep-key2',
 			'wep-key3' (debbugs: #513874)
+		- (update_wireless_security_setting_from_if_block): fix
+			mapping for ifupdown wireless- keys not supported
+			wireless security settings: password, identity and
+			key
+
 
 2008-12-11  Dan Williams  <dcbw redhat com>
 
diff --git a/system-settings/plugins/ifupdown/parser.c b/system-settings/plugins/ifupdown/parser.c
index 451ce8a..4083175 100644
--- a/system-settings/plugins/ifupdown/parser.c
+++ b/system-settings/plugins/ifupdown/parser.c
@@ -301,9 +301,9 @@ update_wireless_security_setting_from_if_block(NMConnection *connection,
 	const gchar* value = ifparser_getkey (block, "inet");
 	struct _Mapping mapping[] = {
 		{"psk", "psk"},
-		{"identity", "identity"},
-		{"password", "password"},
-		{"key", "key"},
+		{"identity", "leap-username"},
+		{"password", "leap-password"},
+		{"key", "wep-key0"},
 		{"key-mgmt", "key-mgmt"},
 		{"group", "group"},
 		{"pairwise", "pairwise"},
@@ -420,7 +420,7 @@ update_wireless_security_setting_from_if_block(NMConnection *connection,
 					    property_value
 #else // DEBUG_SECRETS
 					    !strcmp("key", newkey) ||
-					    !strcmp("password", newkey) ||
+					    !strcmp("leap-password", newkey) ||
 					    !strcmp("pin", newkey) ||
 					    !strcmp("psk", newkey) ||
 					    !strcmp("wep-key0", newkey) ||
-- 
1.6.0.4