fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 09:00:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-04-25 Robert Love <rml@novell.com>

Browse source 
* src/nm-ap-security-wep.c: Bug fix: We stopped setting the
	  key mode (the authentication algorithm), e.g. open or shared, when we
	  moved to using wpa_supplicant.  wpa_supplicant defaults to open, so
	  only shared was broken.  If the user specified a shared key, set it
	  explicitly, otherwise let wpa_supplicant go with the default.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1705 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-04-25 18:08:19 +00:00 • committed by Robert Love
parent 552a3e3bc5
commit 71b7fcc56a
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-04-25 Robert Love <rml@novell.com>
* src/nm-ap-security-wep.c: Bug fix: We stopped setting the
key mode (the authentication algorithm), e.g. open or shared, when we
moved to using wpa_supplicant. wpa_supplicant defaults to open, so
only shared was broken. If the user specified a shared key, set it
explicitly, otherwise let wpa_supplicant go with the default.
2006-04-24 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c

15
src/nm-ap-security-wep.c
View file

@ -39,6 +39,11 @@ struct _NMAPSecurityWEPPrivate
int auth_algorithm;
};
static int get_auth_algorithm (NMAPSecurityWEP *security)
{
return security->priv->auth_algorithm;
}
static void set_description (NMAPSecurityWEP *security)
{
NMAPSecurity * parent = NM_AP_SECURITY (security);
@ -121,6 +126,16 @@ real_write_supplicant_config (NMAPSecurity *instance,
"SET_NETWORK %i key_mgmt NONE", nwid))
goto out;
/*
* If the user selected "Shared" (aka restricted) key, set it explicitly. Otherwise,
* let wpa_supplicant default to the right thing, which is an open key.
*/
if (get_auth_algorithm (NM_AP_SECURITY_WEP (instance)) == IW_AUTH_ALG_SHARED_KEY)
{
if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, msg,
"SET_NETWORK %i auth_alg SHARED", nwid));
}
msg = g_strdup_printf ("SET_NETWORK %i wep_key0 <key>", nwid);
if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, msg,
"SET_NETWORK %i wep_key0 %s", nwid, key))