commit 2280799d6f77e3f1ddb95356173c1b9c9f17fc1f
author Paul Stewart <pstew@chromium.org> Wed Apr 11 08:48:31 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed Apr 11 10:38:35 2012 -0700
tree cb4d131fd80f5e3a9c594e05b8ef89d7ce14cb00
parent 0c43833150ce2b5cd408c12e0f96ce6903dee8a5

shill: vpn: Provide OpenVPN.Mgmt.Enable and VPN.Domain

Neither of these properties are used in shill (not used in flimflam
either), but due to its fleeting use in a test script, the practice
of setting these parameters became a part of Chrome/ONC.  Support
setting these parameters for now, while we're in transition.

BUG=chromium-os:29286
TEST=Rerun unit tests

Change-Id: Id6abffd964d266cc06e67432a9cd938cbaba136a
Reviewed-on: https://gerrit.chromium.org/gerrit/19986
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>

openvpn_driver.cc

diff --git a/openvpn_driver.cc b/openvpn_driver.cc
index 2f55edd..9ea08ae 100644
--- a/openvpn_driver.cc
+++ b/openvpn_driver.cc
@@ -56,7 +56,6 @@
 const char kOpenVPNTLSAuthProperty[] = "OpenVPN.TLSAuth";
 const char kOpenVPNVerbProperty[] = "OpenVPN.Verb";
 const char kVPNMTUProperty[] = "VPN.MTU";
-
 }  // namespace
 
 // static
@@ -103,6 +102,9 @@
   { kOpenVPNTLSAuthProperty, false },
   { kOpenVPNVerbProperty, false },
   { kVPNMTUProperty, false },
+
+  // Provided only for compatibility.  crosbug.com/29286
+  { flimflam::kOpenVPNMgmtEnableProperty, false },
 };
 
 OpenVPNDriver::OpenVPNDriver(ControlInterface *control,

vpn_service.cc

diff --git a/vpn_service.cc b/vpn_service.cc
index 2154808..4d29ed7 100644
--- a/vpn_service.cc
+++ b/vpn_service.cc
@@ -27,7 +27,9 @@
                        Manager *manager,
                        VPNDriver *driver)
     : Service(control, dispatcher, metrics, manager, Technology::kVPN),
-      driver_(driver) {}
+      driver_(driver) {
+  mutable_store()->RegisterString(flimflam::kVPNDomainProperty, &vpn_domain_);
+}
 
 VPNService::~VPNService() {}
 

vpn_service.h

diff --git a/vpn_service.h b/vpn_service.h
index 6466a57..a7f0544 100644
--- a/vpn_service.h
+++ b/vpn_service.h
@@ -48,6 +48,9 @@
   std::string storage_id_;
   scoped_ptr<VPNDriver> driver_;
 
+  // Provided only for compatibility.  crosbug.com/29286
+  std::string vpn_domain_;
+
   DISALLOW_COPY_AND_ASSIGN(VPNService);
 };