fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 20:40:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-util: fix nm_setting_wireless_ap_security_compatible()

Browse source 
It was still looking at priv->security.
This commit is contained in:
Dan Winship 2013-09-03 13:47:46 -04:00
parent 2d9366bcee
commit 5094d00b1e
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libnm-util/nm-setting-wireless.c
View file

@ -164,7 +164,7 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless,
priv = NM_SETTING_WIRELESS_GET_PRIVATE (s_wireless);
if (!priv->security) {
if (!s_wireless_sec) {
if ( (ap_flags & NM_802_11_AP_FLAGS_PRIVACY)
|| (ap_wpa != NM_802_11_AP_SEC_NONE)
|| (ap_rsn != NM_802_11_AP_SEC_NONE))
@ -172,13 +172,8 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless,
return TRUE;
}
if (strcmp (priv->security, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME) != 0)
return FALSE;
if (s_wireless_sec)
key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wireless_sec);
if (s_wireless_sec == NULL || !key_mgmt)
key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wireless_sec);
if (!key_mgmt)
return FALSE;
/* Static WEP */