diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-08-04 11:07:19 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2017-08-04 13:30:21 -0700 |
| commit | c2c36b661cf80f88305fc15907a6df16a0342862 (patch) | |
| tree | 249e30de94207f41fce34b8fd3f332588ec4aea4 | |
| parent | b09c4fc95793953cca7aa5ca49519b2a83c4bf19 (diff) | |
| download | bionic-c2c36b661cf80f88305fc15907a6df16a0342862.tar.gz | |
Remove a check for AIDs in the OEM range.
Remove the check that AIDs in the OEM range are not defind in
android_filesystem_config, as we do not yet have a good solution for
OEMs to define custom AIDs and what OEMs are currently doing isn't
hurting anything.
Bug: b/64137613
Test: pwd.getpwent_iterate / grp.getgrent_iterate
Change-Id: If98ad4443fe9e827e3f17b3df92eca82763e6290
(cherry picked from commit a14485addeacc23587743dad307184c00224b823)
| -rw-r--r-- | tests/grp_pwd_test.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp index f8232aa73..b8df8e790 100644 --- a/tests/grp_pwd_test.cpp +++ b/tests/grp_pwd_test.cpp @@ -207,7 +207,14 @@ TEST(pwd, getpwent_iterate) { application = true; } else { ASSERT_STREQ("/", pwd->pw_dir); - ASSERT_FALSE(exist[pwd->pw_uid]); + // TODO(b/27999086): fix this check with the OEM range + // If OEMs add their own AIDs to private/android_filesystem_config.h, this check will fail. + // Long term we want to create a better solution for OEMs adding AIDs, but we're not there + // yet, so therefore we do not check for uid's in the OEM range. + if (!(pwd->pw_uid >= 2900 && pwd->pw_uid <= 2999) && + !(pwd->pw_uid >= 5000 && pwd->pw_uid <= 5999)) { + ASSERT_FALSE(exist[pwd->pw_uid]); + } exist[pwd->pw_uid] = true; } } @@ -453,7 +460,14 @@ TEST(grp, getgrent_iterate) { if (grp->gr_gid >= exist.size()) { application = true; } else { - ASSERT_FALSE(exist[grp->gr_gid]); + // TODO(b/27999086): fix this check with the OEM range + // If OEMs add their own AIDs to private/android_filesystem_config.h, this check will fail. + // Long term we want to create a better solution for OEMs adding AIDs, but we're not there + // yet, so therefore we do not check for gid's in the OEM range. + if (!(grp->gr_gid >= 2900 && grp->gr_gid <= 2999) && + !(grp->gr_gid >= 5000 && grp->gr_gid <= 5999)) { + ASSERT_FALSE(exist[grp->gr_gid]); + } exist[grp->gr_gid] = true; } } |