Mirrors/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2026-01-23 02:24:06 +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
commit 8213558cc7
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client.c
View file

@ -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");
#endif
@ -545,7 +545,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;
};

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

2
tmux.c
View file

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