Bug 790054 - Allow WPA-EAP networks based on a gecko pref. r=fabrice

This commit is contained in:
Blake Kaplan 2012-12-21 16:57:19 -05:00
parent d0e63b15b2
commit 6c1ae065e2

View File

@ -1619,6 +1619,7 @@ function WifiWorker() {
this.wantScanResults = [];
this._allowWpaEap = false;
this._needToEnableNetworks = false;
this._highestPriority = -1;
@ -1785,6 +1786,12 @@ function WifiWorker() {
WifiManager.saveConfig(function() {})
});
try {
self._allowWpaEap = Services.prefs.getBoolPref("b2g.wifi.allow_unsafe_wpa_eap");
} catch (e) {
self._allowWpaEap = false;
}
// Check if we need to dequeue requests first.
self._notifyAfterStateChange(true, true);
@ -2063,7 +2070,8 @@ function WifiWorker() {
("wep_key0" in known && known.wep_key0)) {
network.password = "*";
}
} else if ((eapIndex = network.capabilities.indexOf("WPA-EAP")) >= 0) {
} else if (!self._allowWpaEap &&
(eapIndex = network.capabilities.indexOf("WPA-EAP")) >= 0) {
// Don't offer to connect to WPA-EAP networks unless one has been
// configured through other means (e.g. it was added directly to
// wpa_supplicant.conf). Here, we have an unknown WPA-EAP network,