X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=wpa_supplicant%2Fap.c;h=1ba2ab34d0c726c2258406afb0c9ccb9e05d6a6b;hb=b6317b417f5dfb16711ec1a7ab3600f77479fe20;hp=4ed04005788e1a63314982f25ef54a4058ea8183;hpb=23d71a028695ac8a7b6be7971a294b06c1eaa4fa;p=mech_eap.git

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 4ed0400..1ba2ab3 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -420,6 +420,8 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
 	     !(bss->wpa & 2)))
 		goto no_wps; /* WPS2 does not allow WPA/TKIP-only
 			      * configuration */
+	if (ssid->wps_disabled)
+		goto no_wps;
 	bss->eap_server = 1;
 
 	if (!ssid->ignore_broadcast_ssid)