From 5094d00b1eab7d19f4c41a994881b588356298da Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 3 Sep 2013 13:47:46 -0400 Subject: [PATCH] libnm-util: fix nm_setting_wireless_ap_security_compatible() It was still looking at priv->security. --- libnm-util/nm-setting-wireless.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index c2d44ed727..817569df12 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -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 */