From f59dbe88337c5aab1a681515ac0899f6ff73d7e8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 23 Oct 2007 14:31:14 +0000 Subject: [PATCH] 2007-10-23 Dan Williams * src/supplicant-manager/nm-supplicant-config.c - (nm_supplicant_config_add_setting_wireless_security): only add WPA-specific options when WPA is in use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3007 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/supplicant-manager/nm-supplicant-config.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c75bdf846..6605c4d649 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-23 Dan Williams + + * src/supplicant-manager/nm-supplicant-config.c + - (nm_supplicant_config_add_setting_wireless_security): only add + WPA-specific options when WPA is in use + 2007-10-23 Dan Williams * src/supplicant-manager/nm-supplicant-config.c diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index a5c55b129c..ca5a752083 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -471,11 +471,17 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig * self, ADD_STRING_VAL (setting->private_key_passwd, "private_key_passwd", FALSE, FALSE, TRUE); ADD_STRING_VAL (setting->phase2_private_key_passwd, "private_key2_passwd", FALSE, FALSE, TRUE); - ADD_STRING_LIST_VAL (setting->proto, "proto", TRUE, FALSE); - ADD_STRING_LIST_VAL (setting->pairwise, "pairwise", TRUE, FALSE); - ADD_STRING_LIST_VAL (setting->group, "group", TRUE, FALSE); ADD_STRING_LIST_VAL (setting->eap, "eap", TRUE, FALSE); + /* Only WPA-specific things when using WPA */ + if ( !strcmp (setting->key_mgmt, "wpa-none") + || !strcmp (setting->key_mgmt, "wpa-psk") + || !strcmp (setting->key_mgmt, "wpa-eap")) { + ADD_STRING_LIST_VAL (setting->proto, "proto", TRUE, FALSE); + ADD_STRING_LIST_VAL (setting->pairwise, "pairwise", TRUE, FALSE); + ADD_STRING_LIST_VAL (setting->group, "group", TRUE, FALSE); + } + ADD_BLOB_VAL (setting->ca_cert, "ca_cert", connection_uid); ADD_BLOB_VAL (setting->client_cert, "client_cert", connection_uid); ADD_BLOB_VAL (setting->private_key, "private_key", connection_uid);