Merge branch 'obsd-master'

Conflicts:
	server.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-23 21:20:54 +00:00
6 changed files with 15 additions and 15 deletions

4
tmux.c
View File

@ -261,8 +261,8 @@ main(int argc, char **argv)
usage();
#ifdef __OpenBSD__
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");
#endif