be00b8b Merge pull request #1449 from kdkd/master — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge pull request #1449 from kdkd/master

Baptiste Daroussin committed 9 years ago

commit be00b8b916ebaac792dc5c41806dc2048922fd6a
parent 1ff1646

1 file changed +4 -0

modified libpkg/pkg.c

@@ -1783,7 +1783,11 @@ pkg_open_root_fd(struct pkg *pkg)

 	path = pkg_kv_get(&pkg->annotations, "relocated");
 	if (path == NULL) {
 #ifdef F_DUPFD_CLOEXEC
 		if ((pkg->rootfd = fcntl(rootfd, F_DUPFD_CLOEXEC, 0)) == -1) {
 #else
 		if ((pkg->rootfd = dup(rootfd)) == -1 || fcntl(pkg->rootfd, F_SETFD, FD_CLOEXEC) == -1) {
 #endif
 			pkg_emit_errno("dup2", "rootfd");
 			return (EPKG_FATAL);
 		}