diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-11-15 14:32:49 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-11-15 14:32:49 +0000 |
| commit | d004024346c36617bdff81c69fcc6757e2c58f4b (patch) | |
| tree | a1eb9bd0931d1d8ea3bdc4e87d0ab058fd34f99c /usr.bin | |
| parent | 36c5aabe11ee1421096d830e88f762c43fe7268a (diff) | |
Accidentally turned off pledge, turn it back on.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/client.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/server.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index 61a580b730a..56ec2d3174b 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.104 2015/11/14 09:41:06 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.105 2015/11/15 14:32:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -289,7 +289,7 @@ client_main(struct event_base *base, int argc, char **argv, int flags) * * "sendfd" is dropped later in client_dispatch_wait(). */ - if (0 && pledge("stdio unix sendfd proc exec tty", NULL) != 0) + if (pledge("stdio unix sendfd proc exec tty", NULL) != 0) fatal("pledge failed"); /* Free stuff that is not used in the client. */ @@ -541,7 +541,7 @@ client_dispatch_wait(struct imsg *imsg) * get the first message from the server. */ if (!pledge_applied) { - if (0 && pledge("stdio unix proc exec tty", NULL) != 0) + if (pledge("stdio unix proc exec tty", NULL) != 0) fatal("pledge failed"); pledge_applied = 1; }; diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index 137bad27d3d..03aa14fd681 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.148 2015/11/14 09:41:07 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.149 2015/11/15 14:32:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -175,7 +175,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile) if (debug_level > 3) tty_create_log(); - if (0 && pledge("stdio rpath wpath cpath fattr unix recvfd proc exec tty " + if (pledge("stdio rpath wpath cpath fattr unix recvfd proc exec tty " "ps", NULL) != 0) fatal("pledge failed"); diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 5cdbd0b56c7..e07799a5dc5 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.153 2015/11/14 09:41:07 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.154 2015/11/15 14:32:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -255,7 +255,7 @@ main(int argc, char **argv) if (shell_cmd != NULL && argc != 0) usage(); - if (0 && pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd " + if (pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd " "proc exec tty ps", NULL) != 0) err(1, "pledge"); |