aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-11-14 11:38:30 +0000
committerThomas Adam <thomas@xteddy.org>2015-11-14 11:38:30 +0000
commit7b749eff3510ccf173c029a92c266e91454ce600 (patch)
tree8194d8dcf4d3364360960c741a3266cb9a9d7101 /tmux.c
parent23266e8e095fb590543d309ae3c8e30fcd98d6b7 (diff)
parentc56b81a2ce815f6d289232f20bb6e07cfd0e36ec (diff)
downloadrtmux-7b749eff3510ccf173c029a92c266e91454ce600.tar.gz
rtmux-7b749eff3510ccf173c029a92c266e91454ce600.tar.bz2
rtmux-7b749eff3510ccf173c029a92c266e91454ce600.zip
Merge branch 'obsd-master'
Conflicts: server.c tmux.c
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmux.c b/tmux.c
index c88b119d..9e5ddb66 100644
--- a/tmux.c
+++ b/tmux.c
@@ -261,7 +261,7 @@ main(int argc, char **argv)
usage();
#ifdef __OpenBSD__
- if (pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd "
+ if (0 && pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd "
"proc exec tty ps", NULL) != 0)
err(1, "pledge");
#endif