| Index: chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| index e709c75015843cb05fbd1eab3f44717a6594de23..297822b6b676b5de4bc71d465d6f8aba08ac8996 100644
|
| --- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| +++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| @@ -636,11 +636,16 @@ void ShillToONCTranslator::TranslateStaticIPConfig() {
|
| void ShillToONCTranslator::TranslateEap() {
|
| CopyPropertiesAccordingToSignature();
|
|
|
| - // Translate EAP Outer and Inner values.
|
| - TranslateWithTableAndSet(shill::kEapMethodProperty, kEAPOuterTable,
|
| - ::onc::eap::kOuter);
|
| - TranslateWithTableAndSet(shill::kEapPhase2AuthProperty, kEAP_TTLS_InnerTable,
|
| - ::onc::eap::kInner);
|
| + // Translate EAP Outer and Inner values if EAP.EAP exists and is not empty.
|
| + std::string shill_eap;
|
| + if (shill_dictionary_->GetStringWithoutPathExpansion(
|
| + shill::kEapMethodProperty, &shill_eap) &&
|
| + !shill_eap.empty()) {
|
| + TranslateWithTableAndSet(shill::kEapMethodProperty, kEAPOuterTable,
|
| + ::onc::eap::kOuter);
|
| + TranslateWithTableAndSet(shill::kEapPhase2AuthProperty,
|
| + kEAP_TTLS_InnerTable, ::onc::eap::kInner);
|
| + }
|
| }
|
|
|
| void ShillToONCTranslator::TranslateAndAddNestedObject(
|
|
|