From: Jouni Malinen <j@w1.fi>
Date: Sun, 19 Aug 2012 09:26:21 +0000 (+0300)
Subject: Interworking: Do not reconnect without "auto" parameter
X-Git-Tag: hostap_2_0~387
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b95f57ba5d374baff72d111fcec8ba5a86e7fa8;p=thirdparty%2Fhostap.git

Interworking: Do not reconnect without "auto" parameter

When there was no credential match, but an enabled network block matched
with a scan result, wpa_supplicant reconnected at the end of
interworking_select command even if "auto" parameter was not used. Fix
this by running the reconnect only if requested to automatically select
a network.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c
index ea720d21a..cdb7fbc10 100644
--- a/wpa_supplicant/interworking.c
+++ b/wpa_supplicant/interworking.c
@@ -1395,7 +1395,8 @@ static void interworking_select_network(struct wpa_supplicant *wpa_s)
 		if (interworking_find_network_match(wpa_s)) {
 			wpa_printf(MSG_DEBUG, "Interworking: Possible BSS "
 				   "match for enabled network configurations");
-			interworking_reconnect(wpa_s);
+			if (wpa_s->auto_select)
+				interworking_reconnect(wpa_s);
 			return;
 		}