picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

execute: check tcpwrap for sockets passed via new-style socket passing as well.

Browse source
This commit is contained in:
Lennart Poettering 2010-07-02 23:25:25 +02:00
parent dd1eb43ba7
commit c5da34ef1b
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/execute.c
View file

@ -970,11 +970,20 @@ int exec_spawn(ExecCommand *command,
goto fail;
}
if (socket_fd >= 0 && context->tcpwrap_name)
if (!socket_tcpwrap(socket_fd, context->tcpwrap_name)) {
r = EXIT_TCPWRAP;
goto fail;
if (context->tcpwrap_name) {
if (socket_fd >= 0)
if (!socket_tcpwrap(socket_fd, context->tcpwrap_name)) {
r = EXIT_TCPWRAP;
goto fail;
}
for (i = 0; i < (int) n_fds; i++) {
if (!socket_tcpwrap(fds[i], context->tcpwrap_name)) {
r = EXIT_TCPWRAP;
goto fail;
}
}
}
if (confirm_spawn) {
char response;