[systemd-commits] src/execute.c

[Lennart Poettering]

 src/execute.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 73883adc1eb4c749b0cf6fed210040e57dd7147e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 14 04:47:57 2010 +0200

    socket: don't close sockets when activating per-connection units

diff --git a/src/execute.c b/src/execute.c
index 6b6c285..352def3 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -976,7 +976,8 @@ int exec_spawn(ExecCommand *command,
                 /* Close sockets very early to make sure we don't
                  * block init reexecution because it cannot bind its
                  * sockets */
-                if (close_all_fds(fds, n_fds) < 0) {
+                if (close_all_fds(socket_fd >= 0 ? &socket_fd : fds,
+                                  socket_fd >= 0 ? 1 : n_fds) < 0) {
                         r = EXIT_FDS;
                         goto fail;
                 }