fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-19 08:58:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-10-23 Dan Williams <dcbw@redhat.com>

Browse source 
* 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
This commit is contained in:
Dan Williams 2007-10-23 14:31:14 +00:00
parent 235aeb7dc2
commit f59dbe8833
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-23 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-config.c

12
src/supplicant-manager/nm-supplicant-config.c
View file

@ -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);