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

Simplify the fix for bootstrap tools

Browse Source 
building head is not supported from prior to stable/10 where sys/capsicum.h was
named sys/capabilities.h

Reported by:	kib
This commit is contained in:
Baptiste Daroussin 2016-09-18 19:16:48 +00:00
parent 8197e93d39
commit e645c6addb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=305949
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#if __FreeBSD_version > 1001510
#include <sys/capsicum.h>
#else
#include <sys/capabilities.h>
#endif
#include <sys/types.h>
@ -163,10 +165,8 @@ main(int argc, char **argv)
int ret = 0;
int flags = 0;
char cwd[MAXPATHLEN];
#if __FreeBSD_version > 1001510
unsigned long cmd;
cap_rights_t rights;
#endif
includes = sl_init();
if (getcwd(cwd, sizeof(cwd)) != NULL)
@ -200,7 +200,6 @@ main(int argc, char **argv)
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);
/*
* EBADF in case stdin is closed by the caller
@ -227,7 +226,6 @@ main(int argc, char **argv)
if (cap_enter() < 0 && errno != ENOSYS)
err(EXIT_FAILURE, "unable to enter capability mode");
#endif
if (argc == 0)
ret = soelim_file(rootfd, stdin, flags);