summaryrefslogtreecommitdiff
path: root/usr.bin/write/write.c
diff options
context:
space:
mode:
authorMariusz Zaborski <oshogbo@FreeBSD.org>2018-11-04 19:24:49 +0000
committerMariusz Zaborski <oshogbo@FreeBSD.org>2018-11-04 19:24:49 +0000
commit377421df9690cddad7f0c8cba84bd392e62a3b6c (patch)
tree8abd5aa51822658825b9055a2be48f3f3c0b7bcb /usr.bin/write/write.c
parenteda66948fe3eb3134f19c97689f9ca55abce8565 (diff)
Notes
Diffstat (limited to 'usr.bin/write/write.c')
-rw-r--r--usr.bin/write/write.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 3f0f1a1aa9cd..2febe3b42302 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -97,7 +97,7 @@ main(int argc, char **argv)
err(1, "open(/dev)");
cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL, CAP_LOOKUP,
CAP_PWRITE);
- if (cap_rights_limit(devfd, &rights) < 0 && errno != ENOSYS)
+ if (caph_rights_limit(devfd, &rights) < 0)
err(1, "can't limit devfd rights");
/*
@@ -106,15 +106,15 @@ main(int argc, char **argv)
*/
cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL, CAP_READ,
CAP_WRITE);
- if ((cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS) ||
- (cap_rights_limit(STDOUT_FILENO, &rights) < 0 && errno != ENOSYS) ||
- (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS) ||
- (cap_ioctls_limit(STDIN_FILENO, cmds, nitems(cmds)) < 0 && errno != ENOSYS) ||
- (cap_ioctls_limit(STDOUT_FILENO, cmds, nitems(cmds)) < 0 && errno != ENOSYS) ||
- (cap_ioctls_limit(STDERR_FILENO, cmds, nitems(cmds)) < 0 && errno != ENOSYS) ||
- (cap_fcntls_limit(STDIN_FILENO, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) ||
- (cap_fcntls_limit(STDOUT_FILENO, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) ||
- (cap_fcntls_limit(STDERR_FILENO, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS))
+ if (caph_rights_limit(STDIN_FILENO, &rights) < 0 ||
+ caph_rights_limit(STDOUT_FILENO, &rights) < 0 ||
+ caph_rights_limit(STDERR_FILENO, &rights) < 0 ||
+ caph_ioctls_limit(STDIN_FILENO, cmds, nitems(cmds)) < 0 ||
+ caph_ioctls_limit(STDOUT_FILENO, cmds, nitems(cmds)) < 0 ||
+ caph_ioctls_limit(STDERR_FILENO, cmds, nitems(cmds)) < 0 ||
+ caph_fcntls_limit(STDIN_FILENO, CAP_FCNTL_GETFL) < 0 ||
+ caph_fcntls_limit(STDOUT_FILENO, CAP_FCNTL_GETFL) < 0 ||
+ caph_fcntls_limit(STDERR_FILENO, CAP_FCNTL_GETFL) < 0)
err(1, "can't limit stdio rights");
caph_cache_catpages();