===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/job.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- src/usr.bin/tmux/job.c	2010/08/19 18:29:01	1.20
+++ src/usr.bin/tmux/job.c	2010/10/16 08:31:55	1.21
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.20 2010/08/19 18:29:01 nicm Exp $ */
+/* $OpenBSD: job.c,v 1.21 2010/10/16 08:31:55 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -169,6 +169,8 @@
 		if (nullfd != STDIN_FILENO && nullfd != STDERR_FILENO)
 			close(nullfd);
 
+		closefrom(STDERR_FILENO + 1);
+
 		execl(_PATH_BSHELL, "sh", "-c", job->cmd, (char *) NULL);
 		fatal("execl failed");
 	default:	/* parent */
@@ -178,8 +180,6 @@
 		if ((mode = fcntl(job->fd, F_GETFL)) == -1)
 			fatal("fcntl failed");
 		if (fcntl(job->fd, F_SETFL, mode|O_NONBLOCK) == -1)
-			fatal("fcntl failed");
-		if (fcntl(job->fd, F_SETFD, FD_CLOEXEC) == -1)
 			fatal("fcntl failed");
 
 		if (job->event != NULL)