summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-06 15:39:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-06 15:39:45 +0000
commit552af3051c5ab2dea9e04715cf329b0cef0371db (patch)
tree4188955399292bcd66e0d9e7ab015324509f427d /usr.bin
parentbcd717a718a3790611ee0c7f742a6c4b1e13e30c (diff)
Move from tame "cmsg" to tame "sendfd" or "recvfd", depending on which
way the process moves fd's.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/file/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index f6e13e9bca1..1ac228c3f91 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.50 2015/10/05 06:23:34 deraadt Exp $ */
+/* $OpenBSD: file.c,v 1.51 2015/10/06 15:39:44 deraadt Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -351,7 +351,7 @@ child(int fd, pid_t parent, int argc, char **argv)
int i, idx;
size_t len, width = 0;
- if (tame("stdio cmsg getpw proc", NULL) == -1)
+ if (tame("stdio getpw proc recvfd", NULL) == -1)
err(1, "tame");
if (geteuid() == 0) {
@@ -366,7 +366,7 @@ child(int fd, pid_t parent, int argc, char **argv)
err(1, "setresuid");
}
- if (tame("stdio cmsg", NULL) == -1)
+ if (tame("stdio recvfd", NULL) == -1)
err(1, "tame");
m = magic_load(magicfp, magicpath, cflag || Wflag);