circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	server.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-15 22:49:25 +00:00
parent bb820fa761 a582b62287
commit 8213558cc7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server.c
View File

@ -176,7 +176,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
tty_create_log();
#ifdef __OpenBSD__
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");
#endif