diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 13:07:56 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 13:07:56 +0000 |
| commit | 75fad93a0466f646dd4f18ec73533c6940d8e067 (patch) | |
| tree | 33b9a68bb94eee4575afb3251a6a074ae4646ea7 | |
| parent | e163cf6aacf12c2d0665eb75514943b716734efa (diff) | |
| download | chromium_src-75fad93a0466f646dd4f18ec73533c6940d8e067.zip chromium_src-75fad93a0466f646dd4f18ec73533c6940d8e067.tar.gz chromium_src-75fad93a0466f646dd4f18ec73533c6940d8e067.tar.bz2 | |
Chrome OS: Update serial number key priority.
The collision due to the mosys serial_number key has been resolved, so
we can now re-prioritize the keys to try serial_number first and then
fall back to legacy keys. This is important for getting the correct
serial number on newer ZGBs, because they now have a valid serial number
in "serial_number", but a fake serial number in "sn".
BUG=chromium-os:31652
TEST=Enterprise enrollment still works for all devices.
Review URL: https://chromiumcodereview.appspot.com/10542072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141201 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/policy/browser_policy_connector.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 322bd83..82d1bc5 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -74,17 +74,14 @@ const char kMachineInfoSystemHwqual[] = "hardware_class"; // These are the machine serial number keys that we check in order until we // find a non-empty serial number. The VPD spec says the serial number should be -// in the "serial_number" key for v2+ VPDs. However, we cannot check this first, -// since we'd get the "serial_number" value from the SMBIOS (yes, there's a name -// clash here!), which is different from the serial number we want and not -// actually per-device. So, we check the legacy keys first. If we find a -// serial number for these, we use it, otherwise we must be on a newer device -// that provides the correct data in "serial_number". +// in the "serial_number" key for v2+ VPDs. However, legacy devices used a +// different keys to report their serial number, which we fall back to if +// "serial_number" is not present. const char* kMachineInfoSerialNumberKeys[] = { - "sn", // ZGB + "serial_number", // VPD v2+ devices "Product_S/N", // Alex "Product_SN", // Mario - "serial_number" // VPD v2+ devices + "sn", // old ZGB devices (more recent ones use serial_number) }; #endif |