mirror of
https://github.com/tmate-io/tmate.git
synced 2024-12-24 07:38:53 +01:00
Merge branch 'obsd-master'
Conflicts: server.c tmux.c
This commit is contained in:
commit
8213558cc7
4
client.c
4
client.c
@ -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
2
server.c
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user