a159fe4 libpkg: fix getgrnam_r related errors — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

libpkg: fix getgrnam_r related errors

Baptiste Daroussin committed 1 month ago

commit a159fe45274bc3bec3a18ac5feaf31e8d043b91e
parent 0014e8b

2 files changed +6 -6

modified libpkg/pkg_add.c

@@ -1694,7 +1694,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src, struct pkgdb *db __unused)

 			err = getpwnam_r(d->uname, &pwent, buffer,
 			    sizeof(buffer), &pw);
 			if (err != 0) {
 				pkg_emit_errno("getpwnam_r", d->uname);
 				pkg_emit_error("getpwnam_r(%s): %s", d->uname, strerror(err));
 				retcode = EPKG_FATAL;
 				goto cleanup;
 			}

@@ -1706,7 +1706,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src, struct pkgdb *db __unused)

 			err = getgrnam_r(d->gname, &grent, buffer,
 			    sizeof(buffer), &gr);
 			if (err != 0) {
 				pkg_emit_errno("getgrnam_r", d->gname);
 				pkg_emit_error("getgrnam_r(%s): %s", d->gname, strerror(err));
 				retcode = EPKG_FATAL;
 				goto cleanup;
 			}

@@ -1750,7 +1750,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src, struct pkgdb *db __unused)

 			err = getpwnam_r(f->uname, &pwent, buffer,
 			    sizeof(buffer), &pw);
 			if (err != 0) {
 				pkg_emit_errno("getpwnam_r", f->uname);
 				pkg_emit_error("getpwnam_r(%s): %s", f->uname, strerror(err));
 				retcode = EPKG_FATAL;
 				goto cleanup;
 			}

@@ -1763,7 +1763,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src, struct pkgdb *db __unused)

 			err = getgrnam_r(f->gname, &grent, buffer,
 			    sizeof(buffer), &gr);
 			if (err != 0) {
 				pkg_emit_errno("getgrnam_r", f->gname);
 				pkg_emit_error("getgrnam_r(%s): %s", f->gname, strerror(err));
 				retcode = EPKG_FATAL;
 				goto cleanup;
 			}

modified libpkg/utils.c

@@ -1155,7 +1155,7 @@ get_uid_from_uname(const char *uname)

 	err = getpwnam_r(testuname, &pwent, user_buffer, sizeof(user_buffer),
 	    &result);
 	if (err != 0) {
 		pkg_emit_errno("getpwnam_r", testuname);
 		pkg_emit_error("getpwnam_r(%s): %s", testuname, strerror(err));
 		return (0);
 	}
 	if (result == NULL)

@@ -1179,7 +1179,7 @@ get_gid_from_gname(const char *gname)

 	err = getgrnam_r(testgname, &grent, group_buffer, sizeof(group_buffer),
 	    &result);
 	if (err != 0) {
 		pkg_emit_errno("getgrnam_r", testgname);
 		pkg_emit_error("getgrnam_r(%s): %s", testgname, strerror(err));
 		return (0);
 	}
 	if (result == NULL)