diff options
| author |   nicm <nicm@openbsd.org> | 2015-11-22 19:41:19 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-11-22 19:41:19 +0000 |
| commit | cb19d99cdc75f6ea54fc1e80e2f0143b748bf044 (patch) | |
| tree | 02d013a2e19525bb6c15bebc51a7cef4a31198ea | |
| parent | Use yy_size_t instead of int in yy_input(). Makes things work on BE 64-bit (diff) | |
| download | wireguard-openbsd-cb19d99cdc75f6ea54fc1e80e2f0143b748bf044.tar.xz wireguard-openbsd-cb19d99cdc75f6ea54fc1e80e2f0143b748bf044.zip | |
Add getpw to pledge, makes tmux work in YP environments, discovered by
matthieu, ok deraadt
| -rw-r--r-- | usr.bin/tmux/server.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index b18ce50647e..6f1fd4cf42d 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.150 2015/11/18 14:27:44 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.151 2015/11/22 19:41:19 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -175,8 +175,8 @@ server_start(struct event_base *base, int lockfd, char *lockfile) if (debug_level > 3) tty_create_log(); - if (pledge("stdio rpath wpath cpath fattr unix recvfd proc exec tty " - "ps", NULL) != 0) + if (pledge("stdio rpath wpath cpath fattr unix getpw recvfd proc exec " + "tty ps", NULL) != 0) fatal("pledge failed"); RB_INIT(&windows); diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 3d188fbed63..14c6e44dfdb 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.155 2015/11/20 12:01:19 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.156 2015/11/22 19:41:19 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -255,8 +255,8 @@ main(int argc, char **argv) if (shell_cmd != NULL && argc != 0) usage(); - if (pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd " - "proc exec tty ps", NULL) != 0) + if (pledge("stdio rpath wpath cpath flock fattr unix getpw sendfd " + "recvfd proc exec tty ps", NULL) != 0) err(1, "pledge"); /* |