2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2fe9652070b..1eb0c5f02ea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacs.c (main): Close daemon_pipe on exec.
+
 2008-12-08  Chong Yidong  <cyd@stupidchicken.com>
 
         * termchar.h (struct tty): New members termcap_term_buffer and
diff --git a/src/emacs.c b/src/emacs.c
index b4d09ac5d2d..bd733da303f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1143,6 +1143,10 @@ main (int argc, char **argv)
         daemon_name = xstrdup (dname_arg);
       /* Close unused reading end of the pipe.  */
       close (daemon_pipe[0]);
+      /* Make sure that the used end of the pipe is closed on exec, so
+         that it is not accessible to programs started from .emacs.  */
+      fcntl (daemon_pipe[1], F_SETFD, FD_CLOEXEC);
+
 #ifdef HAVE_SETSID
       setsid();
 #endif