(main): Close daemon_pipe on exec.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2fe9652070b7c9159c17170fb2ca2d344ddc861e..1eb0c5f02ea3a647f7830b6265451d0f1703a92f 100644 (file)
--- 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 b4d09ac5d2d5496abf6df8aaced0fdc0631b73d8..bd733da303f2432c4eab11c14aac7f50d501a978 100644 (file)
--- 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