From patchwork Mon Dec 12 17:23:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 130803 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 430921007D1 for ; Tue, 13 Dec 2011 04:24:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 198A09C156; Mon, 12 Dec 2011 12:24:32 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aSMw7gSNS167; Mon, 12 Dec 2011 12:24:31 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 058A49C15B; Mon, 12 Dec 2011 12:24:27 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 2BEE49C15B for ; Mon, 12 Dec 2011 12:24:25 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r2rGLZSByefX for ; Mon, 12 Dec 2011 12:24:20 -0500 (EST) Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "smtp.autistici.org", Issuer "Autistici/Inventati Certification Authority" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 006D19C156 for ; Mon, 12 Dec 2011 12:24:19 -0500 (EST) Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 49595C8652; Mon, 12 Dec 2011 17:24:18 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org 49595C8652 From: Antonio Quartulli To: hostap Subject: [PATCHv2] ctrl_iface: check for IEEE8021X_EAPOL definition in wpa_supplicant_ctrl_iface_ctrl_rsp_handle() Date: Mon, 12 Dec 2011 18:23:48 +0100 Message-Id: <1323710628-12208-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1323709238-32367-1-git-send-email-ordex@autistici.org> References: <1323709238-32367-1-git-send-email-ordex@autistici.org> X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com 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 --- Sign line modified wpa_supplicant/ctrl_iface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index b9ec347..29d507b 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,11 @@ int wpa_supplicant_ctrl_iface_ctrl_rsp_handle(struct wpa_supplicant *wpa_s, } return 0; + +#else /* IEEE8021X_EAPOL */ + wpa_printf(MSG_DEBUG, "CTRL_IFACE: 802.1X not included"); + return -1; +#endif /* IEEE8021X_EAPOL */ }