Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.c

1 files changed, 3 insertions, 0 deletions

diff --git a/tmux.c b/tmux.c
index 7a513f01..7f55f395 100644
--- a/tmux.c
+++ b/tmux.c
@@ -42,6 +42,7 @@ struct hooks	*global_hooks;
 
 struct timeval	 start_time;
 const char	*socket_path;
+int		 ptm_fd = -1;
 
 static __dead void	 usage(void);
 static char		*make_label(const char *);
@@ -261,6 +262,8 @@ main(int argc, char **argv)
 		usage();
 
 #ifdef __OpenBSD__
+	if (pty_open(&ptm_fd) != 0)
+		errx(1, "open(\"/dev/ptm\"");
 	if (pledge("stdio rpath wpath cpath flock fattr unix getpw sendfd "
 	    "recvfd proc exec tty ps", NULL) != 0)
 		err(1, "pledge");