summaryrefslogtreecommitdiffstats
path: root/chromeos/network/onc/onc_normalizer.cc
diff options
context:
space:
mode:
authorpneubeck <pneubeck@chromium.org>2014-09-09 03:46:01 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-09 10:48:00 +0000
commitfaf50c40335fd2055c8beed69c0f630bd442d880 (patch)
tree0dfdfbb72d3bb1b0f098122ebf92d08a538c8574 /chromeos/network/onc/onc_normalizer.cc
parent457b0a1c94129337a08d0efcc3fd016205a981b4 (diff)
downloadchromium_src-faf50c40335fd2055c8beed69c0f630bd442d880.zip
chromium_src-faf50c40335fd2055c8beed69c0f630bd442d880.tar.gz
chromium_src-faf50c40335fd2055c8beed69c0f630bd442d880.tar.bz2
ONC: Fix Static-/Saved-/IPConfig.
Before commit 41ec57e48ebd467c7a3b169a5598fb8038f54232, IPConfigs was the field in ONC meant for configuring ip configuration of a network. This was changed to: - IPConfigs is the set of currently active ip configurations (it can be more than one if IPv4 and IPv6 are coexisting in parallel) reported by ChromeOS - StaticIPConfig (note that it's a single configuration, not multiple as before) is the writable field that the user or policy can set - SavedIPConfig is the configuration received via DHCP and reported by ChromeOS. This change updates the different ONC functions to these new field definitions. Effectively this also allows setting the IPConfig of a network through ONC import, the networkingPrivate API, and through policy (there's no server support though). BUG=410877 Review URL: https://codereview.chromium.org/540333002 Cr-Commit-Position: refs/heads/master@{#293915}
Diffstat (limited to 'chromeos/network/onc/onc_normalizer.cc')
-rw-r--r--chromeos/network/onc/onc_normalizer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/network/onc/onc_normalizer.cc b/chromeos/network/onc/onc_normalizer.cc
index 61266f7..e2d869c 100644
--- a/chromeos/network/onc/onc_normalizer.cc
+++ b/chromeos/network/onc/onc_normalizer.cc
@@ -153,7 +153,7 @@ void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
bool remove = false;
network->GetBooleanWithoutPathExpansion(::onc::kRemove, &remove);
if (remove) {
- network->RemoveWithoutPathExpansion(::onc::network_config::kIPConfigs,
+ network->RemoveWithoutPathExpansion(::onc::network_config::kStaticIPConfig,
NULL);
network->RemoveWithoutPathExpansion(::onc::network_config::kName, NULL);
network->RemoveWithoutPathExpansion(::onc::network_config::kNameServers,