Merge branch 'obsd-master'

Conflicts:
	server.c
	tmux.c

1 files changed, 1 insertions, 1 deletions

diff --git a/server.c b/server.c
index 190dcfac..4e2304b3 100644
--- a/server.c
+++ b/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