diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-25 17:18:25 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-25 17:18:25 +0000 |
| commit | 85d983901debfc73020e79faf6bb8bb06310cb2f (patch) | |
| tree | f47028d54e5f758669153de266531a557960abcf /chromeos | |
| parent | 8917a67934617e7627d9241e8fb31545d4141429 (diff) | |
| download | chromium_src-85d983901debfc73020e79faf6bb8bb06310cb2f.zip chromium_src-85d983901debfc73020e79faf6bb8bb06310cb2f.tar.gz chromium_src-85d983901debfc73020e79faf6bb8bb06310cb2f.tar.bz2 | |
A recent change in Shill (https://gerrit.chromium.org/gerrit/#/c/41664/) uncovered that Chrome isn't sending the WiFi Mode to Shill in case of configuration by policy and user import.
Changing the ONC to Shill translation code, so that the WiFi mode property will be sent in case of policies and user import.
BUG=177661
TBR=stevenjb@chromium.org (for test file changes in chromeos/test)
Review URL: https://chromiumcodereview.appspot.com/12320065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
4 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc index 9bc9d48..84c38fd 100644 --- a/chromeos/network/onc/onc_translator_onc_to_shill.cc +++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc @@ -135,6 +135,9 @@ void LocalTranslator::TranslateWiFi() { TranslateWithTableAndSet(security, kWiFiSecurityTable, flimflam::kSecurityProperty); + // We currently only support managed and no adhoc networks. + shill_dictionary_->SetStringWithoutPathExpansion(flimflam::kModeProperty, + flimflam::kModeManaged); CopyFieldsAccordingToSignature(); } diff --git a/chromeos/test/data/network/shill_wifi_clientcert.json b/chromeos/test/data/network/shill_wifi_clientcert.json index 5936934..f6664d2 100644 --- a/chromeos/test/data/network/shill_wifi_clientcert.json +++ b/chromeos/test/data/network/shill_wifi_clientcert.json @@ -3,6 +3,7 @@ "EAP.Identity": "abc ${LOGIN_ID}@my.domain.com", "EAP.UseSystemCAs": true, "GUID": "{77db0089-0bc8-4358-929c-123xcv}", + "Mode": "managed", "SSID": "SomeWifi-XY", "SaveCredentials": true, "Security": "802_1x", diff --git a/chromeos/test/data/network/shill_wifi_clientref.json b/chromeos/test/data/network/shill_wifi_clientref.json index d7cca33..541032b8 100644 --- a/chromeos/test/data/network/shill_wifi_clientref.json +++ b/chromeos/test/data/network/shill_wifi_clientref.json @@ -3,6 +3,7 @@ "EAP.Identity": "${LOGIN_ID}@my.domain.com", "EAP.UseSystemCAs": true, "GUID": "{77db0089-0bc8-4358-929c-123xcv}", + "Mode": "managed", "SSID": "SomeWifi-XY", "SaveCredentials": true, "Security": "802_1x", diff --git a/chromeos/test/data/network/shill_wifi_psk.json b/chromeos/test/data/network/shill_wifi_psk.json index 572c4ac..bdde41b 100644 --- a/chromeos/test/data/network/shill_wifi_psk.json +++ b/chromeos/test/data/network/shill_wifi_psk.json @@ -1,6 +1,7 @@ { "AutoConnect": true, "GUID": "{64c4f86b-cf6a-4e4a-8eff-456def}", + "Mode": "managed", "Passphrase": "some passphrase", "SSID": "OpenWrt", "Security": "psk", |