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 1b1ba7082c874bd936b9ed4f52b7b877c0eb319c..8caced4c4586a1a2fc9213a4e386928ef568fc9a 100644 |
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc |
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc |
@@ -240,6 +240,13 @@ void ShillToONCTranslator::TranslateIPsec() { |
CopyPropertiesAccordingToSignature(); |
if (shill_dictionary_->HasKey(shill::kL2tpIpsecXauthUserProperty)) |
TranslateAndAddNestedObject(::onc::ipsec::kXAUTH); |
+ std::string client_cert_id; |
+ shill_dictionary_->GetStringWithoutPathExpansion( |
pneubeck (no reviews)
2014/09/04 12:50:14
+Ben who ran into this issue before, see this comm
stevenjb
2014/09/04 15:34:11
I'd rather not block this on a Shill change, we ca
pneubeck (no reviews)
2014/09/04 18:05:20
I didn't intend to suggest blocking this. This sho
|
+ shill::kL2tpIpsecClientCertIdProperty, &client_cert_id); |
+ std::string authentication_type = |
+ client_cert_id.empty() ? ::onc::ipsec::kPSK : ::onc::ipsec::kCert; |
+ onc_object_->SetStringWithoutPathExpansion(::onc::ipsec::kAuthenticationType, |
+ authentication_type); |
} |
void ShillToONCTranslator::TranslateVPN() { |