| Index: chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| index 69d0d41dbce2207f961c262f5b05482cce5c9838..5300a9d424b5e003ceb66a2c5c9b62c3922b06d1 100644
|
| --- a/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| +++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| @@ -218,8 +218,8 @@ void LocalTranslator::TranslateIPsec() {
|
| void LocalTranslator::TranslateVPN() {
|
| CopyFieldFromONCToShill(::onc::vpn::kHost, shill::kProviderHostProperty);
|
| std::string type;
|
| - onc_object_->GetStringWithoutPathExpansion(::onc::vpn::kType, &type);
|
| - TranslateWithTableAndSet(type, kVPNTypeTable, shill::kProviderTypeProperty);
|
| + if (onc_object_->GetStringWithoutPathExpansion(::onc::vpn::kType, &type))
|
| + TranslateWithTableAndSet(type, kVPNTypeTable, shill::kProviderTypeProperty);
|
|
|
| CopyFieldsAccordingToSignature();
|
| }
|
| @@ -232,7 +232,8 @@ void LocalTranslator::TranslateWiFi() {
|
|
|
| std::string ssid;
|
| onc_object_->GetStringWithoutPathExpansion(::onc::wifi::kSSID, &ssid);
|
| - shill_property_util::SetSSID(ssid, shill_dictionary_);
|
| + if (!ssid.empty())
|
| + shill_property_util::SetSSID(ssid, shill_dictionary_);
|
|
|
| // We currently only support managed and no adhoc networks.
|
| shill_dictionary_->SetStringWithoutPathExpansion(shill::kModeProperty,
|
|
|