From: Antonio Quartulli <ordex@autistici.org>
Date: Sat, 17 Dec 2011 16:04:50 +0000 (+0200)
Subject: ctrl_iface: Check for IEEE8021X_EAPOL definition
X-Git-Tag: aosp-jb-start~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b58bcbb2efdaf3f777010f27234b333cfc8f1f00;p=thirdparty%2Fhostap.git

ctrl_iface: Check for IEEE8021X_EAPOL definition

The whole wpa_supplicant_ctrl_iface_ctrl_rsp_handle() function operates
on the ssid->eap field which exists only if IEEE8021X_EAPOL has been
defined. Therefore the whole function body needs to be enclosed within
an #ifdef/endif block.

Signed-hostap: Antonio Quartulli <ordex@autistici.org>
---

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index b9ec347bf..b07c04a02 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -769,6 +769,7 @@ int wpa_supplicant_ctrl_iface_ctrl_rsp_handle(struct wpa_supplicant *wpa_s,
 					      const char *field,
 					      const char *value)
 {
+#ifdef IEEE8021X_EAPOL
 	struct eap_peer_config *eap = &ssid->eap;
 
 	wpa_printf(MSG_DEBUG, "CTRL_IFACE: response handle field=%s", field);
@@ -828,6 +829,10 @@ int wpa_supplicant_ctrl_iface_ctrl_rsp_handle(struct wpa_supplicant *wpa_s,
 	}
 
 	return 0;
+#else /* IEEE8021X_EAPOL */
+	wpa_printf(MSG_DEBUG, "CTRL_IFACE: IEEE 802.1X not included");
+	return -1;
+#endif /* IEEE8021X_EAPOL */
 }