aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-12-28 23:42:46 -0800
committerPaul Eggert2013-12-28 23:42:46 -0800
commit45bd2734b184382f7997dccb9363ed88a5a66542 (patch)
treef131da3dfeed5b29079b45a5a33cb986c174be72 /src
parenta7f7e547d6d011b895cb90ec7963fa05aa7fd21a (diff)
downloademacs-45bd2734b184382f7997dccb9363ed88a5a66542.tar.gz
emacs-45bd2734b184382f7997dccb9363ed88a5a66542.zip
* src/emacs.c (main): [DAEMON_MUST_EXEC]: Restore close-on-exec after exec.
Fixes: debbugs:16262
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c
index b5bd3129ad2..2e835c34a8b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1117,6 +1117,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
1117 sscanf (dname_arg, "\n%d,%d\n%s", &(daemon_pipe[0]), &(daemon_pipe[1]), 1117 sscanf (dname_arg, "\n%d,%d\n%s", &(daemon_pipe[0]), &(daemon_pipe[1]),
1118 dname_arg2); 1118 dname_arg2);
1119 dname_arg = *dname_arg2 ? dname_arg2 : NULL; 1119 dname_arg = *dname_arg2 ? dname_arg2 : NULL;
1120 fcntl (daemon_pipe[1], F_SETFD, FD_CLOEXEC);
1120 } 1121 }
1121#endif /* DAEMON_MUST_EXEC */ 1122#endif /* DAEMON_MUST_EXEC */
1122 1123