Commit 3b466916 authored by pneubeck@chromium.org's avatar pneubeck@chromium.org

Update onc_spec.html to match implementation.

onc_validator had some deviations from the onc_spec.
This updates the onc_spec.

BUG=386182
R=davidroche@chromium.org, pastarmovj@chromium.org

Review URL: https://codereview.chromium.org/366273002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282016 0039d316-1c4b-4281-b951-d872f2087c98
parent c04ba154
...@@ -457,12 +457,6 @@ bool Validator::ValidateToplevelConfiguration(base::DictionaryValue* result) { ...@@ -457,12 +457,6 @@ bool Validator::ValidateToplevelConfiguration(base::DictionaryValue* result) {
if (FieldExistsAndHasNoValidValue(*result, kType, valid_types)) if (FieldExistsAndHasNoValidValue(*result, kType, valid_types))
return false; return false;
// Not part of the ONC spec:
// - We don't require the type field (we assume that it's an
// UnencryptedConfiguration then).
// - We don't require specific toplevel objects to be present (e.g. at least
// one of NetworkConfiguration or Certificates).
if (IsGlobalNetworkConfigInUserImport(*result)) if (IsGlobalNetworkConfigInUserImport(*result))
return false; return false;
......
...@@ -189,7 +189,8 @@ ...@@ -189,7 +189,8 @@
<dt class="field">Type</dt> <dt class="field">Type</dt>
<dd> <dd>
<span class="field_meta"> <span class="field_meta">
(required) (optional, defaults to <span class="value">UnencryptedConfiguration
</span>)
<span class="type">string</span> <span class="type">string</span>
</span> </span>
Must be <span class="value">UnencryptedConfiguration</span>. Must be <span class="value">UnencryptedConfiguration</span>.
...@@ -214,9 +215,10 @@ ...@@ -214,9 +215,10 @@
</dd> </dd>
</dl> </dl>
Besides the field <span class="field">Type</span>, at least one other field At least one actual configuration field
(<span class="field">NetworkConfigurations</span> or (<span class="field">NetworkConfigurations</span> or
<span class="field">Certificates</span>) should be present. <span class="field">Certificates</span>) should be present, however it should
not be considered an error if no such field is present.
<section> <section>
<h1>Network Configuration</h1> <h1>Network Configuration</h1>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment