system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 04:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

2006-01-11 Robert Love <rml@novell.com>

Browse source 
* gnome/applet/wireless-security-manager.c: Fix crash by not asserting
	  that wso_foo_new() returned non-NULL.  Instead, only append the new
	  wso to wsm->options if the wso is non-NULL.  The crux is that we
	  assume that the relevant key types are implied by WEP and WPA as
	  appropriate.  To be sure, they should be, but we should not expect
	  drivers to not be oozing piles of wolf fecal matter.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1319 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-01-11 21:48:39 +00:00 committed by Robert Love
parent 46efeb868a
commit 77c10f94b6
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-01-11 Robert Love <rml@novell.com>
* gnome/applet/wireless-security-manager.c: Fix crash by not asserting
that wso_foo_new() returned non-NULL. Instead, only append the new
wso to wsm->options if the wso is non-NULL. The crux is that we
assume that the relevant key types are implied by WEP and WPA as
appropriate. To be sure, they should be, but we should not expect
drivers to not be oozing piles of wolf fecal matter.
2006-01-11 Robert Love <rml@novell.com>
* configure.in: Add the gcc flags '-Wshadow' and '-Wfloat-equal'.

24
gnome/applet/wireless-security-manager.c
View file

@ -70,35 +70,35 @@ void wsm_set_capabilities (WirelessSecurityManager *wsm, guint32 capabilities)
if (capabilities & NM_802_11_CAP_PROTO_NONE)
{
opt = wso_none_new (wsm->glade_file);
g_assert (opt);
wsm->options = g_slist_append (wsm->options, opt);
if (opt)
wsm->options = g_slist_append (wsm->options, opt);
}
if (capabilities & NM_802_11_CAP_PROTO_WEP)
{
opt = wso_wep_passphrase_new (wsm->glade_file);
g_assert (opt);
wsm->options = g_slist_append (wsm->options, opt);
if (opt)
wsm->options = g_slist_append (wsm->options, opt);
opt = wso_wep_hex_new (wsm->glade_file);
g_assert (opt);
wsm->options = g_slist_append (wsm->options, opt);
if (opt)
wsm->options = g_slist_append (wsm->options, opt);
opt = wso_wep_ascii_new (wsm->glade_file);
g_assert (opt);
wsm->options = g_slist_append (wsm->options, opt);
if (opt)
wsm->options = g_slist_append (wsm->options, opt);
}
if ( (capabilities & NM_802_11_CAP_PROTO_WPA)
|| (capabilities & NM_802_11_CAP_PROTO_WPA2))
{
opt = wso_wpa_psk_passphrase_new (wsm->glade_file, capabilities);
g_assert (opt);
wsm->options = g_slist_append (wsm->options, opt);
if (opt)
wsm->options = g_slist_append (wsm->options, opt);
opt = wso_wpa_psk_hex_new (wsm->glade_file, capabilities);
g_assert (opt);
wsm->options = g_slist_append (wsm->options, opt);
if (opt)
wsm->options = g_slist_append (wsm->options, opt);
}
}