Index: chromeos/network/onc/onc_translation_tables.cc |
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc |
index 119b62bf09507ae21e69b53c4d337cc5630ad7ec..3cf512c1f1ac5869cd835f138ca09749558de16e 100644 |
--- a/chromeos/network/onc/onc_translation_tables.cc |
+++ b/chromeos/network/onc/onc_translation_tables.cc |
@@ -43,7 +43,8 @@ const FieldTranslationEntry ipsec_fields[] = { |
// Ignored by Shill, not necessary to synchronize. |
// { ::onc::ipsec::kIKEVersion, shill::kL2tpIpsecIkeVersion }, |
{ ::onc::ipsec::kPSK, shill::kL2tpIpsecPskProperty}, |
- { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty}, |
+ // This field is converted during translation, see onc_translator_*. |
+ // { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty}, |
{ ::onc::ipsec::kServerCAPEMs, shill::kL2tpIpsecCaCertPemProperty}, |
{NULL}}; |
@@ -55,8 +56,7 @@ const FieldTranslationEntry xauth_fields[] = { |
const FieldTranslationEntry l2tp_fields[] = { |
{ ::onc::vpn::kPassword, shill::kL2tpIpsecPasswordProperty}, |
// We don't synchronize l2tp's SaveCredentials field for now, as Shill |
- // doesn't |
- // support separate settings for ipsec and l2tp. |
+ // doesn't support separate settings for ipsec and l2tp. |
// { ::onc::vpn::kSaveCredentials, &kBoolSignature }, |
{ ::onc::vpn::kUsername, shill::kL2tpIpsecUserProperty}, {NULL}}; |
@@ -80,7 +80,8 @@ const FieldTranslationEntry openvpn_fields[] = { |
// { ::onc::openvpn::kRemoteCertKU, shill::kOpenVPNRemoteCertKUProperty }, |
{ ::onc::openvpn::kRemoteCertTLS, shill::kOpenVPNRemoteCertTLSProperty}, |
{ ::onc::openvpn::kRenegSec, shill::kOpenVPNRenegSecProperty}, |
- { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty}, |
+ // This field is converted during translation, see onc_translator_*. |
+ // { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty}, |
{ ::onc::openvpn::kServerCAPEMs, shill::kOpenVPNCaCertPemProperty}, |
{ ::onc::openvpn::kServerPollTimeout, |
shill::kOpenVPNServerPollTimeoutProperty}, |
@@ -99,8 +100,8 @@ const FieldTranslationEntry verify_x509_fields[] = { |
const FieldTranslationEntry vpn_fields[] = { |
{ ::onc::vpn::kAutoConnect, shill::kAutoConnectProperty}, |
- { ::onc::vpn::kHost, shill::kProviderHostProperty}, |
- // This field is converted during translation, see onc_translator_*. |
+ // These fields are converted during translation, see onc_translator_*. |
+ // { ::onc::vpn::kHost, shill::kProviderHostProperty}, |
// { ::onc::vpn::kType, shill::kProviderTypeProperty }, |
{NULL}}; |
@@ -159,6 +160,7 @@ const FieldTranslationEntry network_fields[] = { |
{ ::onc::network_config::kGUID, shill::kGuidProperty}, |
{ ::onc::network_config::kConnectable, shill::kConnectableProperty }, |
{ ::onc::network_config::kErrorState, shill::kErrorProperty }, |
+ { ::onc::network_config::kPriority, shill::kPriorityProperty }, |
// Shill doesn't allow setting the name for non-VPN networks. |
// Name is conditionally translated, see onc_translator_*. |