From b6e859787e2f4c392c8fa92e4458b5d784570640 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 16 Nov 2011 23:14:57 +0000 Subject: [PATCH] clarify comments about socket activation (Thanks mxf) --- src/main.c | 4 +++- testcases/lib/SocketActivation.pm | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 062a4862..7a7c20ac 100644 --- a/src/main.c +++ b/src/main.c @@ -615,7 +615,9 @@ int main(int argc, char *argv[]) { ev_io_start(main_loop, ipc_io); } - /* Also handle the UNIX domain sockets passed via socket activation */ + /* Also handle the UNIX domain sockets passed via socket activation. The + * parameter 1 means "remove the environment variables", we don’t want to + * pass these to child processes. */ int fds = sd_listen_fds(1); if (fds < 0) ELOG("socket activation: Error in sd_listen_fds\n"); diff --git a/testcases/lib/SocketActivation.pm b/testcases/lib/SocketActivation.pm index f6872fb6..36560a8d 100644 --- a/testcases/lib/SocketActivation.pm +++ b/testcases/lib/SocketActivation.pm @@ -63,8 +63,11 @@ sub activate_i3 { # We are about to exec, but we did not modify $^F to include $socket # when creating the socket (because the file descriptor could have a - # number != 3 which would lead to i3 leaking a file descriptor). - # Therefore, we explicitly have to clear the file descriptor flags now: + # number != 3 which would lead to i3 leaking a file descriptor). This + # caused Perl to set the FD_CLOEXEC flag, which would close $socket on + # exec(), effectively *NOT* passing $socket to the new process. + # Therefore, we explicitly clear FD_CLOEXEC (the only flag right now) + # by setting the flags to 0. POSIX::fcntl($socket, F_SETFD, 0) or die "Could not clear fd flags: $!"; # If the socket does not use file descriptor 3 by chance already, we -- 2.39.5