d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building as bootstrap tools on pre-capsicum.h systems

Browse Source
This commit is contained in:
Baptiste Daroussin 2016-09-18 18:49:18 +00:00
parent 2fb709ef75
commit 8197e93d39
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/soelim/soelim.c
View File

@ -27,7 +27,10 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h>
#if __FreeBSD_version > 1001510
#include <sys/capsicum.h> #include <sys/capsicum.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <ctype.h> #include <ctype.h>
@ -159,9 +162,11 @@ main(int argc, char **argv)
int ch, i, rootfd; int ch, i, rootfd;
int ret = 0; int ret = 0;
int flags = 0; int flags = 0;
unsigned long cmd;
char cwd[MAXPATHLEN]; char cwd[MAXPATHLEN];
#if __FreeBSD_version > 1001510
unsigned long cmd;
cap_rights_t rights; cap_rights_t rights;
#endif
includes = sl_init(); includes = sl_init();
if (getcwd(cwd, sizeof(cwd)) != NULL) if (getcwd(cwd, sizeof(cwd)) != NULL)
@ -192,6 +197,10 @@ main(int argc, char **argv)
argc -= optind; argc -= optind;
argv += optind; argv += optind;
rootfd = open("/", O_DIRECTORY | O_RDONLY);
if (rootfd == -1)
err(EXIT_FAILURE, "unable to open '/'");
#if __FreeBSD_version > 1001510
cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_IOCTL); cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_IOCTL);
/* /*
* EBADF in case stdin is closed by the caller * EBADF in case stdin is closed by the caller
@ -204,9 +213,6 @@ main(int argc, char **argv)
err(EXIT_FAILURE, "unable to limit rights for stdout"); err(EXIT_FAILURE, "unable to limit rights for stdout");
if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS) if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS)
err(EXIT_FAILURE, "unable to limit rights for stderr"); err(EXIT_FAILURE, "unable to limit rights for stderr");
rootfd = open("/", O_DIRECTORY | O_RDONLY);
if (rootfd == -1)
err(EXIT_FAILURE, "unable to open '/'");
cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_FSTAT, CAP_FCNTL); cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_FSTAT, CAP_FCNTL);
if (cap_rights_limit(rootfd, &rights) < 0 && errno != ENOSYS) if (cap_rights_limit(rootfd, &rights) < 0 && errno != ENOSYS)
err(EXIT_FAILURE, "unable to limit rights"); err(EXIT_FAILURE, "unable to limit rights");
@ -221,6 +227,7 @@ main(int argc, char **argv)
if (cap_enter() < 0 && errno != ENOSYS) if (cap_enter() < 0 && errno != ENOSYS)
err(EXIT_FAILURE, "unable to enter capability mode"); err(EXIT_FAILURE, "unable to enter capability mode");
#endif
if (argc == 0) if (argc == 0)
ret = soelim_file(rootfd, stdin, flags); ret = soelim_file(rootfd, stdin, flags);