jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

io: use opendirectory for UID/GID lookups on macOS 

macOS has no concept of a chroot-specific UID/GID database, as the database is actually
LDAP.

ref #10794
cute-signatures
Ariadne Conill 2021-12-13 12:19:05 -06:00 committed by Timo Teräs
parent 9d07d07fe4
commit 03a5e6d9b9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/io.c
View File

@ -1187,8 +1187,11 @@ static void idcache_load_users(int root_fd, struct apk_id_hash *idh)
do {
#ifdef HAVE_FGETPWENT_R
fgetpwent_r(in, &pwent, buf, sizeof(buf), &pwd);
#else
#elif !defined(__APPLE__)
pwd = fgetpwent(in);
#else
# warning macOS does not support nested /etc/passwd databases, using system one.
pwd = getpwent();
#endif
if (!pwd) break;
idcache_add(idh, APK_BLOB_STR(pwd->pw_name), pwd->pw_uid);
@ -1217,8 +1220,11 @@ static void idcache_load_groups(int root_fd, struct apk_id_hash *idh)
do {
#ifdef HAVE_FGETGRENT_R
fgetgrent_r(in, &grent, buf, sizeof(buf), &grp);
#else
#elif !defined(__APPLE__)
grp = fgetgrent(in);
#else
# warning macOS does not support nested /etc/group databases, using system one.
grp = getgrent();
#endif
if (!grp) break;
idcache_add(idh, APK_BLOB_STR(grp->gr_name), grp->gr_gid);