f312738 Fix running pkg in an env where 0 has been closed — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix running pkg in an env where 0 has been closed

Baptiste Daroussin committed 9 years ago

commit f3127387ac46c3734b7414db883e14227adac15f
parent f76d3e6

1 file changed +2 -2

modified libpkg/pkg_config.c

@@ -831,7 +831,7 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 	k = NULL;
 	o = NULL;
 	if (rootfd == -1 && (rootfd = open("/", O_DIRECTORY|O_RDONLY)) <= 0) {
 	if (rootfd == -1 && (rootfd = open("/", O_DIRECTORY|O_RDONLY)) < 0) {
 		pkg_emit_error("Impossible to open /");
 		return (EPKG_FATAL);
 	}

@@ -1377,7 +1377,7 @@ pkg_set_rootdir(const char *rootdir) {

 	if (rootfd != -1)
 		close(rootfd);
 	if ((rootfd = open(rootdir, O_DIRECTORY|O_RDONLY)) <= 0) {
 	if ((rootfd = open(rootdir, O_DIRECTORY|O_RDONLY)) < 0) {
 		pkg_emit_error("Impossible to open %s", rootdir);
 		return (EPKG_FATAL);
 	}