diff options
| author | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 01:19:52 +0000 |
|---|---|---|
| committer | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 01:19:52 +0000 |
| commit | 3f511d5c9c583bda2629c2fbc5f8fe5a189a3cc5 (patch) | |
| tree | bba9ab47a8c9ef89fc192ae51b50a096fc0a2ba1 /chrome | |
| parent | 52c7571772423908a3c672a55885c1595a45c4ae (diff) | |
| download | chromium_src-3f511d5c9c583bda2629c2fbc5f8fe5a189a3cc5.zip chromium_src-3f511d5c9c583bda2629c2fbc5f8fe5a189a3cc5.tar.gz chromium_src-3f511d5c9c583bda2629c2fbc5f8fe5a189a3cc5.tar.bz2 | |
Fix onc error.
BUG=chromium-os:23757
TEST=Import onc file and make sure that it does not return a network import error.
Review URL: http://codereview.chromium.org/8964006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 57660e2..46eb6b0 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -2943,8 +2943,9 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob, } } - if (parser.GetNetworkConfigsSize() != 0 || - parser.GetCertificatesSize() != 0) { + if (parser.GetNetworkConfigsSize() == 0 && + parser.GetCertificatesSize() == 0) { + LOG(ERROR) << "Onc file missing networks and certs."; if (error) *error = l10n_util::GetStringUTF8( IDS_NETWORK_CONFIG_ERROR_NETWORK_IMPORT); |