diff options
author | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2018-11-04 19:24:49 +0000 |
---|---|---|
committer | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2018-11-04 19:24:49 +0000 |
commit | 377421df9690cddad7f0c8cba84bd392e62a3b6c (patch) | |
tree | 8abd5aa51822658825b9055a2be48f3f3c0b7bcb /usr.bin/diff | |
parent | eda66948fe3eb3134f19c97689f9ca55abce8565 (diff) | |
download | src-377421df9690cddad7f0c8cba84bd392e62a3b6c.tar.gz src-377421df9690cddad7f0c8cba84bd392e62a3b6c.zip |
capsicum: use a new capsicum helpers in tools
Use caph_{rights,ioctls,fcntls}_limit to simplify the code.
Notes
Notes:
svn path=/head/; revision=340138
Diffstat (limited to 'usr.bin/diff')
-rw-r--r-- | usr.bin/diff/diffreg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 56e126a58414..c2fa9fb40621 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -319,11 +319,9 @@ diffreg(char *file1, char *file2, int flags, int capsicum) if (capsicum) { cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); - if (cap_rights_limit(fileno(f1), &rights_ro) < 0 - && errno != ENOSYS) + if (caph_rights_limit(fileno(f1), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file1); - if (cap_rights_limit(fileno(f2), &rights_ro) < 0 && - errno != ENOSYS) + if (caph_rights_limit(fileno(f2), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file2); if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) { /* stding has already been limited */ |