Set kL2tpIpsecCaCertPemProperty as List

BUG=266032 Review URL: https://chromiumcodereview.appspot.com/23346004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218872 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Aug 22, 2013 · e650356 · e650356
1 parent ad1c3bd
commit e650356
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -824,8 +824,10 @@ void VPNConfigView::SetConfigProperties(
     case PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT: {
       std::string ca_cert_pem = GetServerCACertPEM();
       if (!ca_cert_pem.empty()) {
-        properties->SetStringWithoutPathExpansion(
-            shill::kL2tpIpsecCaCertPemProperty, ca_cert_pem);
+        base::ListValue* pem_list = new base::ListValue;
+        pem_list->AppendString(ca_cert_pem);
+        properties->SetWithoutPathExpansion(
+            shill::kL2tpIpsecCaCertPemProperty, pem_list);
       }
       properties->SetStringWithoutPathExpansion(
           flimflam::kL2tpIpsecClientCertIdProperty, GetUserCertID());
@@ -847,7 +849,7 @@ void VPNConfigView::SetConfigProperties(
       std::string ca_cert_pem = GetServerCACertPEM();
       if (!ca_cert_pem.empty()) {
         base::ListValue* pem_list = new base::ListValue;
-        pem_list->AppendString(GetServerCACertPEM());
+        pem_list->AppendString(ca_cert_pem);
         properties->SetWithoutPathExpansion(
             shill::kOpenVPNCaCertPemProperty, pem_list);
       }

diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
@@ -93,7 +93,7 @@ bool VPNIsConfigured(const std::string& service_path,
     provider_properties.GetBooleanWithoutPathExpansion(
         flimflam::kL2tpIpsecPskRequiredProperty, &passphrase_required);
     if (passphrase_required) {
-      NET_LOG_EVENT("VPN: Passphrase Required", service_path);
+      NET_LOG_EVENT("VPN: PSK Required", service_path);
       return false;
     }
     NET_LOG_EVENT("VPN Is Configured", service_path);